lex-xin 8 months ago
parent
commit
0d844357a6

+ 9 - 0
src/utils/dateFormat.ts

@@ -124,6 +124,15 @@ export function getSecend(time: number) {
   return seconds;
 }
 
+export function getChatMinutes(time: number) {
+  const minutes = Math.floor(time / 60);
+  let s = 0
+  if(time % 60) {
+    s = Math.ceil(time % 60 / 60 * 100) / 100
+  }
+  return minutes + s;
+}
+
 
 // 秒转时分秒
 export function formateSeconds(endTime: string, pad = 2) {

+ 3 - 0
src/views/prepare-lessons/components/lesson-main/courseware/addCourseware.tsx

@@ -360,6 +360,7 @@ export default defineComponent({
                   // isCollect: relateMaterialInfo.,
                   isSelected:
                     relateMaterialInfo.sourceFrom === 'PLATFORM' ? true : false,
+                  instrumentIds: relateMaterialInfo.instrumentIds,
                   materialId: relateMaterialInfo.id,
                   isError: checkCurrentIsInstrument(relateMaterialInfo.instrumentIds, relateMaterialInfo.type),
                   // removeFlag: relateMaterialInfo.,
@@ -442,6 +443,8 @@ export default defineComponent({
                 coverImg: relateMaterialInfo.coverImg,
                 isSelected:
                   relateMaterialInfo.sourceFrom === 'PLATFORM' ? true : false,
+                instrumentIds: relateMaterialInfo.instrumentIds,
+                isError: checkCurrentIsInstrument(relateMaterialInfo.instrumentIds, relateMaterialInfo.type),
                 materialId: relateMaterialInfo.id,
                 title: relateMaterialInfo.name,
                 type: relateMaterialInfo.type

+ 6 - 5
src/views/studentList/components/practiceData.tsx

@@ -21,7 +21,8 @@ import {
   getSecend,
   getHours,
   getLastMinutes,
-  formateSeconds
+  formateSeconds,
+  getChatMinutes
 } from '/src/utils/dateFormat';
 import CDatePicker from '/src/components/CDatePicker';
 import TheEmpty from '/src/components/TheEmpty';
@@ -137,7 +138,7 @@ export default defineComponent({
             type: 'value',
             axisLabel: {
               formatter: (value: any) => {
-                return getMinutes(value) + 'min';
+                return (value) + 'min';
               }
             },
             axisTick: {
@@ -188,7 +189,7 @@ export default defineComponent({
             return [
               item[0].axisValueLabel,
               ...item.map((d: any) => {
-                let str = formateSeconds(d.value, 1)
+                let str = formateSeconds(d.value[2], 1)
                 return `<br/>${d.marker}<span style="margin-top:10px;margin-left:5px;font-size: 13px;font-weight: 500;
                   color: #131415;font-weight: 600;
                   margin-top:12px
@@ -225,8 +226,8 @@ export default defineComponent({
           return item.date;
         });
 
-        payForm.timeList = res.data.trainingStatDetailList.map((item: any) => {
-          return item.practiceDuration;
+        payForm.timeList = res.data.trainingStatDetailList.map((item: any, index: number) => {
+          return [index, getChatMinutes(item.practiceDuration), item.practiceDuration];
         });
 
         setChart();