Merge branch 'ol_12_30' into online

src/views/teamDetail/components/modals/course-time-detail.vue

@@ -15,6 +15,7 @@
     <el-table-column
       prop="userId"
       label="学生编号"
+      width="120"
       align="center"
     >
       <template slot-scope="scope">
@@ -42,12 +43,16 @@
       </template>
     </el-table-column>
     <el-table-column
-      v-for="item in extra"
-      :key="item.key"
-      :label="courseType[item.key]"
+      label="课程时长"
     >
       <template slot-scope="scope">
-        {{scope.row.mapDtos[item.key]}}
+        <el-tag
+          style="margin-right: 5px;margin-bottom: 5px;"
+          v-for="item in scope.row.mapDtos"
+          :key="item.key"
+          type="info"
+          size="small"
+        >{{courseType[item.key]}}: {{item.value}}分钟</el-tag>
       </template>
     </el-table-column>
     <!-- <el-table-column
@@ -86,7 +91,7 @@ export default {
         const res = await queryStudentSubTotalCourseTimes({
           musicGroupId: this.$route.query.id,
         })
-        this.list = res.data.map(item => ({...item, mapDtos: this.array2object(item.mapDtos)}))
+        this.list = res.data
         if (res.data[0]) {
           this.extra = res.data[0].mapDtos
         }