处理禅道上面的bug

src/school/companion-teacher/companion-teacher-register.tsx

@@ -91,8 +91,6 @@ export default defineComponent({
         showToast('请阅读并同意协议')
         return
       }
-      console.log(state.forms, '///222')
-      return
       state.btnLoading = true
       try {
         const forms = state.forms

src/school/companion-teacher/index.tsx

@@ -37,6 +37,7 @@ import { postMessage, promisefiyPostMessage } from '@/helpers/native-message'
 import html2canvas from 'html2canvas'
 import { forms } from '../train-planning/create'
 import OFullRefresh from '@/components/o-full-refresh'
+import { format } from 'path'
 
 export default defineComponent({
   name: 'companion-teacher',
@@ -68,7 +69,8 @@ export default defineComponent({
         page: 1,
         rows: 20
       },
-      selectItem: {} as any
+      selectItem: {} as any,
+      paramValue: '2'
     })
 
     const getSubjects = async () => {
@@ -272,10 +274,22 @@ export default defineComponent({
       }
     }
 
-    onMounted(() => {
+    onMounted(async () => {
       getDetail(state.user.data.id)
       getSubjects()
       getList()
+
+      try {
+        const { data } = await request.get('/api-school/open/paramConfig/queryByParamName', {
+          requestType: 'form',
+          params: {
+            paramName: 'qr_code_expire_hours'
+          }
+        })
+        form.paramValue = data.paramValue
+      } catch {
+        //
+      }
     })
     return () => (
       <>
@@ -432,7 +446,7 @@ export default defineComponent({
                 <div style={{ textAlign: 'center' }}>
                   <span class={styles.codeBtnText}>扫描上方二维码完成资料填写</span>
                 </div>
-                <div class={styles.codeTips}>二维码将在两小时后失效，请及时登记</div>
+                <div class={styles.codeTips}>二维码将在{form.paramValue}小时后失效，请及时登记</div>
               </div>
             </div>
             <div class={styles.codeBottom}>

src/school/manage-teacher/index.tsx

@@ -56,7 +56,8 @@ export default defineComponent({
         page: 1,
         rows: 20
       },
-      isClick: false
+      isClick: false,
+      paramValue: '2'
     })
 
     // 获取当前用户所在的学校
@@ -230,11 +231,23 @@ export default defineComponent({
       }
     }
 
-    onMounted(() => {
+    onMounted(async () => {
       // console.log(state.user.data.id, '1212')
       getDetail(state.user.data.id)
 
       getList()
+
+      try {
+        const { data } = await request.get('/api-school/open/paramConfig/queryByParamName', {
+          requestType: 'form',
+          params: {
+            paramName: 'qr_code_expire_hours'
+          }
+        })
+        form.paramValue = data.paramValue
+      } catch {
+        //
+      }
     })
     return () => (
       <>
@@ -347,7 +360,7 @@ export default defineComponent({
                 <div style={{ textAlign: 'center' }}>
                   <span class={styles.codeBtnText}>扫描上方二维码完成资料填写</span>
                 </div>
-                <div class={styles.codeTips}>二维码将在两小时后失效，请及时登记</div>
+                <div class={styles.codeTips}>二维码将在{form.paramValue}小时后失效，请及时登记</div>
               </div>
             </div>
             <div class={styles.codeBottom}>

src/school/orchestra/index.tsx

@@ -32,6 +32,7 @@ export default defineComponent({
       },
       params: {
         type: null,
+        status: 'DONE',
         page: 1,
         rows: 20
       }

src/views/unit-test/examination-mode/index.tsx

@@ -6,6 +6,7 @@ import {
   Icon,
   Image,
   Popup,
+  showDialog,
   Swipe,
   SwipeItem,
   Tag
@@ -105,8 +106,6 @@ export default defineComponent({
       // 判断是否有结果
       if (!userAnswer) return []
       const answers = userAnswer || []
-
-      // const questionItem = answers.find((child: any) => child.questionId === item.id)
       return answers[item.id] ? answers[item.id] : []
     }
 
@@ -141,10 +140,6 @@ export default defineComponent({
               details: question.userAnswer
             })
           }
-
-          // if (index === state.currentIndex) {
-          //   currentResult = question.userAnswer && question.userAnswer.length > 0 ? true : false
-          // }
         })
 
         // 判断是否是最后一题
@@ -154,12 +149,6 @@ export default defineComponent({
           return
         }
 
-        // 判断是否答题了 - 由于连线题
-        // if (!currentResult) {
-        //   swipeRef.value?.next()
-        //   return
-        // }
-
         state.nextStatus = true
         await request.post('/api-student/studentUnitExamination/submitAnswer', {
           hideLoading: true,
@@ -223,11 +212,31 @@ export default defineComponent({
       }
     }
 
+    // 拦截
+    const onBack = () => {
+      showDialog({
+        title: '提示',
+        message: '您考试还未提交，是否退出？',
+        theme: 'round-button',
+        confirmButtonColor: '#ff8057'
+      }).then(() => {
+        onAfter()
+      })
+    }
+
+    const onAfter = () => {
+      window.removeEventListener('popstate', onBack, false)
+      router.back()
+    }
+
     onMounted(() => {
       getExamDetails()
 
       // 初始化高度
       resizeSwipeItemHeight()
+
+      window.history.pushState(null, '', document.URL)
+      window.addEventListener('popstate', onBack, false)
     })
 
     return () => (
@@ -274,14 +283,9 @@ export default defineComponent({
           }}
         >
           {state.questionList.map((item: any, index: number) => (
-            // item.questionTypeCode === QuestionType.PLAY && (
+            // item.questionTypeCode === QuestionType.LINK && (
             //   <SwipeItem>
-            //     <PlayQuestion
-            //       v-model:value={item.userAnswer}
-            //       data={item}
-            //       index={index + 1}
-            //       unitId={state.id as any}
-            //     />
+            //     <KeepLookQuestion v-model:value={item.userAnswer} data={item} index={index + 1} />
             //   </SwipeItem>
             // )
             <SwipeItem>

src/views/unit-test/model/choice-question/index.tsx

@@ -52,7 +52,7 @@ export default defineComponent({
       const result = {
         answerId: item.examinationQuestionAnswerId,
         answer: item.questionAnswer,
-        extra: item.questionExtra
+        answerExtra: item.questionExtra
       }
       if (props.type === 'checkbox') {
         const tempIndex = value.findIndex(

src/views/unit-test/model/drag-question/index.tsx

@@ -88,7 +88,7 @@ export default defineComponent({
         result.push({
           answerId: item.index,
           answer: item.leftValue,
-          extra: rightOption.rightValue
+          answerExtra: rightOption.rightValue
         })
       })
       emit('update:value', result)
@@ -102,11 +102,13 @@ export default defineComponent({
           const rightOption = answers.find(
             (child: any) => answer.answerId === child.examinationQuestionAnswerId
           )
-          const rightValue = answers.find((child: any) => answer.extra === child.questionExtra)
+          const rightValue = answers.find(
+            (child: any) => answer.answerExtra === child.questionExtra
+          )
           const tmp = {
             index: answer.answerId, // 左边的值
             leftValue: answer.answer, // 左边的值
-            rightValue: answer.extra, // 右边的值
+            rightValue: answer.answerExtra, // 右边的值
             leftType: rightOption.questionAnswerTypeCode || 'TXT', // 左边类型
             rightType: rightOption.questionExtraTypeCode || 'TXT', // 右边类型
             rightIndex: rightValue ? rightValue.examinationQuestionAnswerId : ''
@@ -127,7 +129,7 @@ export default defineComponent({
           resultValue.push({
             answerId: answer.examinationQuestionAnswerId,
             answer: answer.questionAnswer,
-            extra: answer.questionExtra
+            answerExtra: answer.questionExtra
           })
           state.options.push(tmp)
         })

src/views/unit-test/model/keep-look-question/index.tsx

@@ -290,7 +290,7 @@ export default defineComponent({
         result.push({
           answerId: leftOption.index,
           answer: leftOption.leftValue,
-          extra: rightOption.rightValue
+          answerExtra: rightOption.rightValue
         })
       })
       emit('update:value', result)
@@ -299,6 +299,7 @@ export default defineComponent({
     const initOptions = () => {
       const answers = props.data.answers || []
       const userAnswer = props.data.userAnswer || [] // 用户填写的答案
+      // console.log(answers, '111')
       answers.forEach((answer: any) => {
         const tmp = {
           index: answer.examinationQuestionAnswerId, // 左边的值
@@ -316,8 +317,8 @@ export default defineComponent({
       })
 
       // 反显答案-初始化数据
+      console.log(userAnswer)
       userAnswer.forEach((user: any) => {
-        console.log(user)
         const temps: any = {
           startPoint: { x: 0, y: 0 },
           endPoint: { x: 0, y: 0 },
@@ -332,7 +333,8 @@ export default defineComponent({
             temps.leftIndex = option.index
           }
           // 右边状态
-          if (option.rightValue === user.extra) {
+          // console.log(option, user, '----')
+          if (option.rightValue === user.answerExtra) {
             option.right = true
             option.leftLocked = true
             temps.rightIndex = option.index
@@ -345,14 +347,19 @@ export default defineComponent({
       // 反显答案-连线
       nextTick(() => {
         state.drawLineList.forEach((draw: any) => {
+          console.log(draw, 'drawLine')
           state.selectItem = []
           const leftObj: any = useRect(document.getElementById(draw.leftIndex + '-left') as any)
           leftObj.index = draw.leftIndex
           state.selectItem[0] = leftObj
-          const rightObj: any = useRect(document.getElementById(draw.leftIndex + '-right') as any)
+          const rightObj: any = useRect(document.getElementById(draw.rightIndex + '-right') as any)
           rightObj.index = draw.rightIndex
           state.selectItem[1] = rightObj
-
+          console.log(state.selectItem, 'state.selectItem')
+          console.log(
+            document.getElementById(draw.leftIndex + '-left'),
+            document.getElementById(draw.rightIndex + '-right')
+          )
           const postion = calcPoint()
           draw.endPoint = postion.endPoint
           draw.startPoint = postion.startPoint
@@ -360,7 +367,7 @@ export default defineComponent({
         })
         setTimeout(() => {
           renderDrawLine(canvasRef.value)
-        }, 60)
+        }, 100)
       })
     }
 

src/views/unit-test/model/play-question/index.tsx

@@ -106,7 +106,7 @@ export default defineComponent({
                 {
                   answerId: answer[0].examinationQuestionId,
                   answer: state.score,
-                  extra: ''
+                  answerExtra: ''
                 }
               ])
             }

src/views/unit-test/practice-mode/index.tsx

@@ -268,7 +268,7 @@ export default defineComponent({
     const onBack = () => {
       showDialog({
         title: '提示',
-        message: '您是否退出 ',
+        message: '您是否退出?',
         theme: 'round-button',
         confirmButtonColor: '#ff8057'
       }).then(() => {