Merge branch '07/06musicArchives' into test

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

@@ -40,13 +40,13 @@
         v-for="(item, index) in subject"
       >
         <div class="descriptionItemLabel">
-          <overflow-text :text="item.key || ''"></overflow-text>
+         {{item.key}}
         </div>
         <div
           class="descriptionItemConcat col-value"
           @click="getSoundInfo(item.courseScheduleId)"
         >
-          <overflow-text :text="item.value + '人' || ''"></overflow-text>
+          {{item.value}}人
         </div>
       </div>
     </div>
@@ -66,7 +66,7 @@
           class="col-value"
           @click="getGradeInfo(String(item.key))"
         >
-          {{ item.value }}人
+          {{ item.value||0 }}人
         </div>
       </descriptions-item>
     </descriptions>
@@ -78,13 +78,13 @@
         v-for="(item, index) in grade"
       >
         <div class="descriptionItemLabel">
-          <overflow-text :text="gradeMap[item.key] || ''"></overflow-text>
+          {{gradeMap[item.key]}}
         </div>
         <div
           class="descriptionItemConcat col-value"
           @click="getGradeInfo(String(item.key))"
         >
-          <overflow-text :text="item.value + '人' || ''"></overflow-text>
+         {{item.value||0}}人
         </div>
       </div>
     </div>
@@ -320,10 +320,10 @@ export default {
   }
 }
 .descriptions {
-    margin-bottom: 30px;
+  margin-bottom: 30px;
   display: flex;
   flex-direction: row;
-    .col-value {
+  .col-value {
     color: #14928a;
     cursor: pointer;
   }
@@ -348,10 +348,6 @@ export default {
       text-align: center;
     }
     .descriptionItemConcat {
-      .col-value {
-        color: #14928a;
-        cursor: pointer;
-      }
       text-align: center;
       white-space: nowrap;
       overflow: hidden;
@@ -364,6 +360,10 @@ export default {
       display: table-cell;
       width: 50%;
     }
+    .col-value {
+      color: #14928a;
+      cursor: pointer;
+    }
   }
 }
 </style>

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

@@ -116,9 +116,9 @@
           >
             {{ item.index }}
             <div class="timeline">
-              <h4 class="time">{{ item.timer || "暂无课程时间" }}</h4>
+              <h4 class="time" :class="item.timer?'':'grey'">{{ item.timer || "暂无课程时间" }}</h4>
               <p class="cuorseType">{{ item.courseType }}</p>
-              <p class="concat">
+              <p class="concat" :class="item.plan.value?'':'grey'">
                 <Tooltip :content="item.plan.value || '暂无规划'" />
               </p>
               <auth auths="musicGroupTrainPlan/update">
@@ -580,4 +580,7 @@ export default {
 .searchForm {
   padding: 0 16px;
 }
+.grey {
+  color: #999;
+}
 </style>