Merge branch 'iteration_0307' into jenkins

src/school/train-report/modal/teacher-attendance.tsx

@@ -81,14 +81,14 @@ export default defineComponent({
 
       for (const i in data) {
         if (i === 'TOTAL') {
-          forms.total = Math.ceil(data[i] * 100)
+          forms.total = data[i]
           // if (forms.total <= 59) {
           //   lineColor = '#FF8057'
           //   textColor = '#F67146'
           // }
         } else {
           titleList.push(reportCourseType[i])
-          valueList.push(Math.ceil(data[i] * 100))
+          valueList.push(data[i])
         }
       }
 
@@ -96,7 +96,7 @@ export default defineComponent({
       const dataNot = props.reportDataNot || {}
       for (const i in dataNot) {
         if (i !== 'TOTAL') {
-          valueList2.push(Math.ceil(dataNot[i] * 100))
+          valueList2.push(dataNot[i])
         }
       }
       if (forms.type.includes('YES')) {
@@ -110,8 +110,8 @@ export default defineComponent({
             color: '#5EA4FF'
           },
           label: {
-            show: true,
-            position: 'top',
+            show: false,
+            // position: 'top',
             fontSize: 10,
             color: '#777777'
           },
@@ -129,7 +129,7 @@ export default defineComponent({
             color: '#69DDE8'
           },
           label: {
-            show: true,
+            show: false,
             position: 'top',
             fontSize: 10,
             color: '#777777'

src/school/train-report/week-report.tsx

@@ -75,7 +75,8 @@ export default defineComponent({
       ORCHESTRA: {},
       PHOTO: {} as any,
       STUDENT_ATTENDANCE: {},
-      TEACHER_ATTENDANCE: {}
+      TEACHER_ATTENDANCE: {},
+      TEACHER_NOT_ATTENDANCE: {}
     })
 
     const getDetail = async () => {
@@ -88,6 +89,7 @@ export default defineComponent({
         reportData.PHOTO = data.reportItem.PHOTO || {}
         reportData.STUDENT_ATTENDANCE = data.reportItem.STUDENT_ATTENDANCE || {}
         reportData.TEACHER_ATTENDANCE = data.reportItem.TEACHER_ATTENDANCE || {}
+        reportData.TEACHER_NOT_ATTENDANCE = data.reportItem.TEACHER_NOT_ATTENDANCE || {}
         reportData.orchestraName = data.orchestraName || ''
         reportData.startTime = data.startTime || ''
         reportData.endTime = data.endTime || ''
@@ -278,7 +280,10 @@ export default defineComponent({
         </div>
 
         <StudentAttendance reportData={reportData.STUDENT_ATTENDANCE} />
-        <TeacherAttendance reportData={reportData.TEACHER_ATTENDANCE} />
+        <TeacherAttendance
+          reportData={reportData.TEACHER_ATTENDANCE}
+          reportDataNot={reportData.TEACHER_NOT_ATTENDANCE}
+        />
 
         <div class={[styles.trainClass]}>
           <Image src={iconClass} class={styles.iconPhoto} />

src/student/pre-register-active/video.tsx

@@ -162,11 +162,15 @@ export default defineComponent({
 
       forms.player = new Plyr('#register-video', params)
 
+      forms.player.on('ready', (item: any) => {
+        console.log('ready', item)
+
+        // forms.player.pause()
+      })
       forms.player.on('loadedmetadata', () => {
         console.log('loadedmetadata')
         forms.loading = false
         forms.player.currentTime = forms.videoBrowsePoint
-
         checkVideoDetails(forms.player.currentTime)
       })
 
@@ -195,7 +199,7 @@ export default defineComponent({
 
       // 如何视频在缓存不会触发
       forms.player.on('timeupdate', () => {
-        // console.log('timeupdate', forms.player.currentTime)
+        console.log('timeupdate', forms.player.currentTime)
         // 时间变化时更新每一段的状态
         checkVideoDetails(forms.player.currentTime)
         // 判断视频计时器是否暂停，如果暂停则恢复
@@ -246,6 +250,7 @@ export default defineComponent({
         const i = document.getElementById('fullscreen-back')
         i && i.remove()
       })
+      checkVideoDetails(0)
     }
 
     // 保存零时时间
@@ -479,6 +484,9 @@ export default defineComponent({
                 class={[item.id === forms.videoSelectId ? styles.active : '']}
                 onClick={() => {
                   forms.player.currentTime = item.startNode
+                  forms.player.play()
+                  forms.videoBrowsePoint = item.startNode
+                  checkVideoDetails(forms.player.currentTime)
                 }}
               >
                 {item.desc}