修改时间与补助明细问题

src/helpers/utils.ts

@@ -123,9 +123,14 @@ export const dateFormat = (value: string | Date, format = 'YYYY-MM-DD HH:mm:ss')
 }
 
 // 秒转分
-export const getSecondRPM = (second: number) => {
+export const getSecondRPM = (second: number, type?: string) => {
   if (isNaN(second)) return '00:00'
   const mm = Math.floor(second / 60).toString().padStart(2, '0')
   const dd = Math.floor(second % 60).toString().padStart(2, '0')
-  return mm + ':' + dd
+  if (type === 'cn') {
+    return mm + '分' + dd + '秒'
+  } else {
+    return mm + ':' + dd
+  }
+
 }

src/router/routes-school.ts

@@ -178,7 +178,7 @@ export default [
         name: 'exercis-detail',
         component: () => import('@/views/exercise-record/exercis-detail'),
         meta: {
-          title: '测评详情'
+          title: '练习统计'
         }
       },
       {

src/router/routes-teacher.ts

@@ -43,7 +43,7 @@ export default [
         name: 'exercis-detail',
         component: () => import('@/views/exercise-record/exercis-detail'),
         meta: {
-          title: '测评详情'
+          title: '练习统计'
         }
       },
       {

src/school/approval-manage/subsidy/details.tsx

@@ -54,8 +54,6 @@ export default defineComponent({
             n.signInTime = n?.signInTime?.split(' ')[1]
             n.signOutTime = n?.signOutTime?.split(' ')[1]
           })
-
-          state.record.courseScheduleTeacherAttendanceList.push({})
         }
       } catch {
         //
@@ -124,20 +122,20 @@ export default defineComponent({
                       <span>
                         {item.classGroupName}-{item.teacherName}
                       </span>
-                      <span
-                        class={styles.itemContentTitleDetail}
-                        style={{
-                          color:
-                            item.coursewarePlayTime >= item.adviseStudyTimeSecond
-                              ? '#358AF5'
-                              : '#F44541'
-                        }}
-                      >
-                        课件使用：{getSecondRPM(item.coursewarePlayTime)}/
-                        {getSecondRPM(item.adviseStudyTimeSecond)}分钟
-                      </span>
                     </div>
                     <div class={styles.itemContentLabel}>{item.orchestraName}</div>
+                    <div
+                      class={styles.itemContentTitleDetail}
+                      style={{
+                        color:
+                          item.coursewarePlayTime >= item.adviseStudyTimeSecond
+                            ? '#358AF5'
+                            : '#F44541'
+                      }}
+                    >
+                      课件使用时长：{getSecondRPM(item.coursewarePlayTime, 'cn')}/
+                      {getSecondRPM(item.adviseStudyTimeSecond, 'cn')}
+                    </div>
                     <div class={styles.times}>
                       <div class={[styles.timesItem, styles.startTime]}>
                         <div class={styles.startTimeTop}>

src/school/orchestra/compontent/information.tsx

@@ -110,19 +110,17 @@ export default defineComponent({
 
     const onConfirmDate = (date: any) => {
       state.currentData = date.selectedValues
+
+      const year = Number(state.currentData[0]) + 1
       if (state.actionType === 'up') {
-        state.params.startTime = dayjs(Number(state.currentData[0]) + startTime.value).format(
-          'YYYY-MM-DD HH:mm:ss'
-        )
-        state.params.endTime = dayjs(Number(state.currentData[0]) + endTime.value)
+        state.params.startTime = dayjs(year + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(year + endTime.value)
           .add(1, 'year')
           .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss')
       } else if (state.actionType === 'down') {
-        state.params.startTime = dayjs(Number(state.currentData[0]) + endTime.value).format(
-          'YYYY-MM-DD HH:mm:ss'
-        )
-        state.params.endTime = dayjs(Number(state.currentData[0]) + startTime.value)
+        state.params.startTime = dayjs(year + endTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(year + startTime.value)
           .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss')
       }
@@ -212,6 +210,8 @@ export default defineComponent({
       const before = dayjs(nowTime).isBefore(dayjs(sysStartTime))
       const after = dayjs(nowTime).isBefore(dayjs(sysEndTime))
       const year = dayjs().year()
+
+      // console.log(before, after, year)
       if (before && after) {
         state.currentData = [year - 1 + '']
         state.params.startTime = dayjs(year - 1 + startTime.value).format('YYYY-MM-DD HH:mm:ss')
@@ -248,6 +248,7 @@ export default defineComponent({
             item.color = ''
           }
         })
+        state.currentData = [year - 1 + '']
       }
 
       await getDetails()

src/school/orchestra/compontent/plan.tsx

@@ -90,19 +90,16 @@ export default defineComponent({
 
     const onConfirmDate = (date: any) => {
       state.currentData = date.selectedValues
+      const year = Number(state.currentData[0]) + 1
       if (state.actionType === 'up') {
-        state.params.startTime = dayjs(Number(state.currentData[0]) + startTime.value).format(
-          'YYYY-MM-DD HH:mm:ss'
-        )
-        state.params.endTime = dayjs(Number(state.currentData[0]) + endTime.value)
+        state.params.startTime = dayjs(year + startTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(year + endTime.value)
           .add(1, 'year')
           .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss')
       } else if (state.actionType === 'down') {
-        state.params.startTime = dayjs(Number(state.currentData[0]) + endTime.value).format(
-          'YYYY-MM-DD HH:mm:ss'
-        )
-        state.params.endTime = dayjs(Number(state.currentData[0]) + startTime.value)
+        state.params.startTime = dayjs(year + endTime.value).format('YYYY-MM-DD HH:mm:ss')
+        state.params.endTime = dayjs(year + startTime.value)
           .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss')
       }
@@ -192,6 +189,8 @@ export default defineComponent({
             item.color = ''
           }
         })
+
+        state.currentData = [year - 1 + '']
       }
 
       await getList()