Merge branch 'vite' of https://gitlab.ezijing.com/ezijing/x-learn into vite

src/modules/teacher/data/course/views/PersonalList.vue

@@ -30,9 +30,30 @@ export default {
         filters: [{ type: 'input', prop: 'personal_name', placeholder: '学生姓名', label: '学生姓名' }],
         columns: [
           { label: '学生姓名', prop: 'personal_name', align: 'center' },
-          { label: '总学习时长', prop: 'all_study_length', align: 'center', sortable: 'custom' },
-          { label: '总完成率', prop: 'all_course_completion_rate', align: 'center', sortable: 'custom' },
-          { label: '本课学习时长', prop: 'study_length', align: 'center', sortable: 'custom' },
+          {
+            label: '总学习时长',
+            prop: 'all_study_length',
+            align: 'center',
+            sortable: 'custom',
+            computed({ row }) {
+              return row.all_study_length_format
+            }
+          },
+          {
+            label: '总完成率',
+            prop: 'all_course_completion_rate',
+            align: 'center',
+            sortable: 'custom'
+          },
+          {
+            label: '本课学习时长',
+            prop: 'study_length',
+            align: 'center',
+            sortable: 'custom',
+            computed({ row }) {
+              return row.study_length_format
+            }
+          },
           { label: '本课完成率', prop: 'course_completion_rate', align: 'center', sortable: 'custom' },
           { label: '操作', slots: 'table-operate', align: 'center' }
         ]

src/modules/teacher/data/course/views/Process.vue

@@ -39,7 +39,14 @@ export default {
           { label: '课程名称', align: 'center', prop: 'course_name' },
           { label: '课程图片', align: 'center', prop: 'course_picture', slots: 'course_picture' },
           { label: '总进度', align: 'center', prop: 'progress', slots: 'progress' },
-          { label: '总时长', align: 'center', prop: 'max_length' },
+          {
+            label: '总时长',
+            align: 'center',
+            prop: 'max_length',
+            computed({ row }) {
+              return row.max_length_format
+            }
+          },
           { label: '操作', slots: 'table-x', align: 'center', fixed: 'right' }
         ]
       }

src/modules/teacher/data/course/views/ProcessDetail.vue

@@ -24,7 +24,14 @@ export default {
           { label: '是否标记完成', align: 'center', prop: 'sign' },
           { label: '最大学习时点', align: 'center', prop: 'mpt' },
           { label: '最后学习时点', align: 'center', prop: 'cpt' },
-          { label: '累计学习时长', align: 'center', prop: 'pt' }
+          {
+            label: '累计学习时长',
+            align: 'center',
+            prop: 'pt',
+            computed({ row }) {
+              return row.pt_format
+            }
+          }
         ]
       }
     }

src/modules/teacher/data/exam/views/PersonalList.vue

@@ -79,9 +79,9 @@ export default {
               if (row.status === 2) {
                 return '已完成'
               } else if (row.status === 1) {
-                return '待批阅'
-              } else if (row.status === 0) {
-                return '未提交'
+                return '待评价'
+              } else if (row.status === 0 || row.status === 3) {
+                return '待提交'
               } else if (row.status === 100) {
                 return '未作答'
               }