Merge branch '07/06musicArchives' of http://git.dayaedu.com/yonge/dy-admin-manager into 07/06musicArchives

src/views/resetTeaming/components/archicesComponents/modals/studentWork.vue

@@ -199,9 +199,8 @@ export default {
       this.loading = true;
       let data = [];
       try {
-
         const res = await getHomeworkStat({
-          musicGroupId:this.$route.query.musicGroupId,
+          musicGroupId:this.$route.query.id,
           ...getTimes(this.mdate, ["startDay", "endDay"]),
         });
         //       desc: descs[item.dataType],

src/views/resetTeaming/components/archicesComponents/studentAndTeacher.vue

@@ -12,8 +12,24 @@
       </template>
     </el-alert>
     <p class="title">声部分布</p>
-    <el-divider class="divider"></el-divider>
-    <div>
+    <!-- <el-divider class="divider"></el-divider> -->
+
+    <descriptions :column="4" class="descriptions">
+      <descriptions-item
+        :label="item.key"
+        :key="index"
+        v-for="(item, index) in subject"
+      >
+        <div
+          v-if="item.value"
+          class="col-value"
+          @click="getSoundInfo(item.courseScheduleId)"
+        >
+          {{ item.value }}人
+        </div>
+      </descriptions-item>
+    </descriptions>
+    <!-- <div>
       <el-row class="row">
         <el-col
           class="col"
@@ -27,18 +43,24 @@
           >
         </el-col>
       </el-row>
-    </div>
+    </div> -->
     <p class="title">年级分布</p>
-    <el-divider class="divider"></el-divider>
-    <el-row class="row">
-      <el-col class="col" :span="6" v-for="(item, index) in grade" :key="index">
-        <span class="col-title">{{ gradeMap[item.key] }}:</span>
-        <span class="col-value" @click="getGradeInfo(String(item.key))"
-          >{{ item.value }}人</span
+    <!-- <el-divider class="divider"></el-divider> -->
+    <descriptions :column="6" class="descriptions">
+      <descriptions-item
+        :label="gradeMap[item.key]"
+        :key="index"
+        v-for="(item, index) in grade"
+      >
+        <div
+          v-if="item.value"
+          class="col-value"
+          @click="getGradeInfo(String(item.key))"
         >
-      </el-col>
-    </el-row>
-
+          {{ item.value }}人
+        </div>
+      </descriptions-item>
+    </descriptions>
     <el-alert :closable="false" class="alert marginBtm22" type="info">
       <template slot="title">
         <div class="shapeWrap">
@@ -55,17 +77,30 @@
         </div>
       </template>
     </el-alert>
-    <el-row class="row">
+    <descriptions :column="4" class="descriptions">
+      <descriptions-item
+        :label="item.key"
+        :key="index"
+        v-for="(item, index) in teacher"
+      >
+        <div v-if="item.value" @click="getSoundInfo(item.courseScheduleId)">
+          <overflow-text :text="item.value || ''"></overflow-text>
+        </div>
+      </descriptions-item>
+    </descriptions>
+    <!-- <el-row class="row">
       <el-col
         class="col"
         :span="6"
         v-for="(item, index) in teacher"
         :key="index"
       >
-        <span class="col-title">{{ item.key }}:</span>
-        <span>{{ item.value }}</span>
+        <span class="col-title">
+          <overflow-text :text="item.key || ''"></overflow-text>:</span
+        >
+        <span>:</span>
       </el-col>
-    </el-row>
+    </el-row> -->
     <!-- studentMaster -->
     <el-dialog
       width="1200px"
@@ -133,19 +168,32 @@ export default {
         });
       }
       this.subject = res.data.subject;
+
+      if (this.subject.length > 0 && this.subject.length < 4) {
+        // 样式丑 至少对齐一排
+        for (let i = 0; i <= 4 - this.subject.length; i++) {
+          this.subject.push({ key: null, value: null });
+        }
+      }
       this.teacher = res.data.teacher;
+      if (this.teacher.length > 0 && this.teacher.length < 4) {
+        // 样式丑 至少对齐一排
+        for (let i = 0; i <= 4 - this.subject.length; i++) {
+          this.teacher.push({ key: null, value: null });
+        }
+      }
     } catch (e) {
       console.log(e);
     }
   },
   methods: {
     getSoundInfo(val) {
-      this.$set(this,'searchForm',{
+      this.$set(this, "searchForm", {
         search: "",
         subjectId: val,
         currentGradeNum: "",
         isBuyInstrumentsInsurance: "",
-      })
+      });
       // this.searchForm = {
       //   search: "",
       //   subjectId: val,
@@ -156,12 +204,12 @@ export default {
       this.studentVisible = true;
     },
     getGradeInfo(val) {
-            this.$set(this,'searchForm',{
+      this.$set(this, "searchForm", {
         search: "",
         subjectId: "",
-        currentGradeNum:val,
+        currentGradeNum: val,
         isBuyInstrumentsInsurance: "",
-      })
+      });
       // this.searchForm = {
       //   search: "",
       //   subjectId: "",
@@ -204,6 +252,13 @@ export default {
     }
   }
 }
+.descriptions {
+  margin-bottom: 30px;
+  .col-value {
+    color: #14928a;
+    cursor: pointer;
+  }
+}
 .shapeWrap {
   display: flex;
   flex-direction: row;

src/views/resetTeaming/components/archicesComponents/trainPlan.vue

@@ -227,6 +227,9 @@ export default {
           filterCourseType[plan.scheduleType]
         }训练规划与课时数不符; `;
       });
+      if(this.planDtosList.length<=0&&this.planDtosList1.length<=0){
+        str=""
+      }
 
       return str;
     },
@@ -243,6 +246,7 @@ export default {
         if (res.code == 200) {
           this.classList = res.data;
           if (this.classList.length < 1) {
+            this.planList=[]
             this.$message.error("当前乐团暂无班级");
             return;
           }
@@ -255,6 +259,7 @@ export default {
         this.searchForm.courseScheduleType = "";
         const res = await getCourseType(obj);
         if (!res.data || res.data.length <= 0) {
+                this.planList=[]
           this.$message.error("当前学期暂无课程类型");
         } else {
           this.courseTypeList = [];
@@ -341,6 +346,7 @@ export default {
         let musicGroupTrainPlans = res2.data.musicGroupTrainPlans;
         if (classDates.length < 1) {
           this.$message.error("当前学期该班级暂无此类型课程");
+                this.planList=[]
           return;
         }
 

src/views/resetTeaming/components/archicesComponents/trainTimer.vue

@@ -76,7 +76,7 @@
           :key="index"
           v-for="(item, index) in dataList"
         >
-        <div v-if="item.totalClassTimes">
+        <div>
            {{ item.currentClassTimes }}/{{ item.totalClassTimes }}课时
         </div>
 

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {