Merge branch 'dev-learning-report-0627' into 'release'

Dev learning report 0627



See merge request !66

src/utils/filter.js

@@ -214,5 +214,23 @@ const vueFilter = {
         return '文件生成失败 请重新操作导出';
     }
   },
+  getAvgTime: (value) => {
+    let list = [0,0];
+    let avgTime = '';
+    if(value != null && value !='') {
+        list[0] = Math.floor(value / 60);
+        list[1] = value % 60;
+    }
+    if(list[0] == 0 && list[1] == 0) {
+        avgTime = list[1] + '秒';
+    } else if(list[0] == 0 && list[1] != 0) {
+        avgTime = list[1] + '秒';
+    } else if(list[0] != 0 && list[1] == 0) {
+        avgTime = list[0] + '分';
+    } else if(list[0] != 0 && list[1] != 0) {
+        avgTime = list[0] + '分' + list[1] + '秒';
+    }
+    return avgTime;
+  },
 }
 export default vueFilter
\ No newline at end of file

src/utils/operation.js

@@ -564,3 +564,11 @@ export function initRank(data) {
   }
   return list;
 }
+export function getAvgTime(data) {
+  let list = [0,0];
+  if(data != null && data !='') {
+    list[0] = Math.floor(data / 60);
+    list[1] = data % 60;
+  }
+  return list;
+}

src/views/learning/item-course-analysis.vue

@@ -6,7 +6,10 @@
             <span class="weight">{{ item.title }}</span>
           </div>
           <div class="box-content">
-            <span class="weight">{{ item.num }} </span> {{ item.unit }}
+            <span v-if="item.num !=0" class="weight">{{ item.num }} </span> 
+            <span v-if="item.num !=0">{{ item.unit }} </span>
+            <span v-if="index == 2 && second !=0" class="weight" >{{ second }} </span> 
+            <span v-if="index == 2 && second !=0">秒</span>
           </div>
         </el-card>
         <div v-if="index+1 !== cardData.length" class="line"></div>
@@ -19,6 +22,9 @@
         <el-table-column prop="courseTotalTime" label="课程时长" align="center">
         </el-table-column>
         <el-table-column prop="courseAvgStudyTime" label="人均学习时长" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.courseAvgStudyTime | getAvgTime }}
+          </template>
         </el-table-column>
         <el-table-column prop="courseLearnerCount" label="参与培训人数" align="center">
         </el-table-column>
@@ -82,6 +88,7 @@ export default {
       projectId: '',
       pageNo: 1,
       pageSize: 10,
+      second: 0,
     }
   },
   created() {
@@ -111,6 +118,8 @@ export default {
   methods: {
     setCardData(data) {
       vm.totalRows = data.projectCourseCount;
+      let avgTime = [];
+      avgTime = operationData.getAvgTime(data.projectAvgStudyTime);
       vm.cardData = [
         {
           title: '项目所有课程数',
@@ -122,13 +131,11 @@ export default {
           unit: '分钟',
         },{
           title: '项目人均学习时长',
-          num: data.projectAvgStudyTime,
+          num: avgTime[0],
           unit: '分钟',
         }
       ];
-      // vm.cardData[0].num = data.projectCourseCount;
-      // vm.cardData[1].num = data.projectCourseTotalTime;
-      // vm.cardData[2].num = data.projectAvgStudyTime;
+      vm.second = avgTime[1];
     },
     search() {
       if (vm.formInline.region.length == 0) {