修改问题

src/components/o-img-code/index.tsx

@@ -73,6 +73,7 @@ export default defineComponent({
         }
         await request.post(`${this.isSuffix}/open/verifyImgCode`, {
           requestType: 'form',
+          hideLoading: true,
           data: {
             phone: this.phone,
             code: this.code
@@ -81,6 +82,7 @@ export default defineComponent({
         console.log(state.clientId, state.platformType)
         await request.post(`${this.isSuffix}/open/sendSms`, {
           requestType: 'form',
+          hideLoading: true,
           data: {
             mobile: this.phone,
             type: this.type,

src/school/orchestra/compontent/information.tsx

@@ -63,9 +63,11 @@ export default defineComponent({
       },
 
       params: {
-        startTime: dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss'),
+        startTime: dayjs(dayjs().year() + startTime.value)
+          .subtract(1, 'year')
+          .format('YYYY-MM-DD HH:mm:ss'),
         endTime: dayjs(dayjs().year() + endTime.value)
-          .add(1, 'year')
+          .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss'),
         page: 1,
         rows: 20

src/school/orchestra/compontent/plan.tsx

@@ -46,9 +46,11 @@ export default defineComponent({
       },
 
       params: {
-        startTime: dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss'),
+        startTime: dayjs(dayjs().year() + startTime.value)
+          .subtract(1, 'year')
+          .format('YYYY-MM-DD HH:mm:ss'),
         endTime: dayjs(dayjs().year() + endTime.value)
-          .add(1, 'year')
+          .subtract(1, 'day')
           .format('YYYY-MM-DD HH:mm:ss'),
         page: 1,
         rows: 20

src/school/orchestra/orchestra-information.tsx

@@ -1,3 +1,4 @@
+import ODialog from '@/components/o-dialog'
 import OEmpty from '@/components/o-empty'
 import OFullRefresh from '@/components/o-full-refresh'
 import OPopup from '@/components/o-popup'
@@ -19,6 +20,7 @@ export default defineComponent({
     const state = reactive({
       addStatus: false,
       isLoading: false,
+      dialogStatus: false,
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -112,13 +114,13 @@ export default defineComponent({
               id: state.selectItem.id
             }
           })
-          setTimeout(() => {
-            showToast('删除成功')
-          }, 100)
+          // setTimeout(() => {
+          //   showToast('删除成功')
+          // }, 100)
 
-          setTimeout(() => {
-            onSearch()
-          }, 1100)
+          // setTimeout(() => {
+          onSearch()
+          // }, 1100)
         } catch {
           //
         }
@@ -223,9 +225,24 @@ export default defineComponent({
           closeOnClickAction
           actions={[
             { name: '修改', callback: () => onUpdate() },
-            { name: '删除', color: '#F44541', callback: () => onRemove() }
+            {
+              name: '删除',
+              color: '#F44541',
+              callback: () => {
+                state.dialogStatus = true
+              }
+            }
           ]}
         />
+
+        <ODialog
+          v-model:show={state.dialogStatus}
+          title="删除资讯"
+          message="是否删除该资讯？确认后学生端、伴学端将同步删除"
+          messageAlign="left"
+          showCancelButton
+          onConfirm={onRemove}
+        />
       </div>
     )
   }

src/student/music-group/pre-apply/component/apply.tsx

@@ -288,7 +288,8 @@ export default defineComponent({
                 // 退团重新报名也不能更新声部
                 if (
                   props.registerInfo?.registerStatus === 'LEARNING' ||
-                  props.registerInfo?.registerStatus === 'OUTOF_ORCHESTRA'
+                  (props.registerInfo?.registerStatus === 'OUTOF_ORCHESTRA' &&
+                    props.registerInfo?.orderNumber > 0)
                 ) {
                   state.subjectChangeStatus = true
                   return

src/views/unit-test/model/answer-analysis/index.tsx

@@ -21,6 +21,14 @@ export default defineComponent({
     answerAnalysis: {
       type: String,
       default: ''
+    },
+    rightFlagText: {
+      type: String,
+      default: '回答正确'
+    },
+    errorFlagText: {
+      type: String,
+      default: '回答错误'
     }
   },
   setup(props) {
@@ -31,12 +39,12 @@ export default defineComponent({
             {props.userResult ? (
               <div class={[styles.analysisResult, styles.success]}>
                 <Icon name={iconSuccess} class={styles.aImg} />
-                回答正确
+                {props.rightFlagText}
               </div>
             ) : (
               <div class={[styles.analysisResult, styles.error]}>
                 <Icon name={iconError} class={styles.aImg} />
-                回答错误
+                {props.errorFlagText}
               </div>
             )}
           </>

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

@@ -95,9 +95,10 @@ export default defineComponent({
       const result: any = []
 
       list.forEach((item: any, index: number) => {
+        // console.log(item, 'item')
         result.push({
-          answerId: item.index,
-          answer: item.leftValue,
+          answerId: item.answerId,
+          answer: item.answer,
           answerExtra: index + 1
         })
       })
@@ -110,6 +111,7 @@ export default defineComponent({
       if (item.checked) return
       const result: any = []
       state.options.forEach((option: any, index: any) => {
+        // console.log(option, '------')
         result.push({
           answerId: option.index,
           answer: option.leftValue,
@@ -152,9 +154,7 @@ export default defineComponent({
           const rightOption = answers.find(
             (child: any) => answer.answerId === child.examinationQuestionAnswerId
           )
-          const rightValue = answers.find(
-            (child: any) => answer.answerExtra === child.questionExtra
-          )
+          const rightValue = answers.find((child: any) => answer.answerExtra == child.questionExtra)
           const tmp = {
             itemIndex: index,
             index: answer.answerId, // 左边的值
@@ -166,7 +166,7 @@ export default defineComponent({
           }
           state.options.push(tmp)
         })
-        // console.log(state.options)
+        // console.log(state.options, 'after options')
         // state.list = state.options
       }
       // else {

src/views/unit-test/model/error-mode/index.tsx

@@ -13,6 +13,10 @@ export default defineComponent({
     answerAnalysis: {
       type: String,
       default: ''
+    },
+    questionTypeCode: {
+      type: String,
+      default: ''
     }
   },
   emits: ['close', 'conform'],
@@ -21,7 +25,8 @@ export default defineComponent({
       <div class={styles.popupResult}>
         <div class={styles.resultTitle}>
           <Image src={iconError} class={styles.titleImg} />
-          回答错误！
+
+          {props.questionTypeCode === 'SORT' ? '不合格！' : '回答错误！'}
         </div>
 
         {/* <div class={styles.result}>

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

@@ -60,7 +60,8 @@ export default defineComponent({
       default: () => ({
         message: '',
         topic: false, // 是否显示结果
-        userResult: true // 用户答题对错
+        userResult: true, // 用户答题对错
+        score: 0 // 分数
       })
     }
   },
@@ -183,6 +184,14 @@ export default defineComponent({
       })
     }
 
+    onMounted(() => {
+      //
+      const userValue: any = props.value || []
+      if (userValue.length > 0) {
+        state.score = userValue[0].answer
+      }
+    })
+
     return () => (
       <>
         <div class={styles.unitSubject}>
@@ -241,6 +250,8 @@ export default defineComponent({
               answerAnalysis={props.analysis.message}
               topic={props.analysis.topic}
               userResult={props.analysis.userResult}
+              rightFlagText={'合格'}
+              errorFlagText={'不合格'}
             />
           </div>
         )}

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

@@ -56,6 +56,7 @@ export default defineComponent({
       nextStatus: false,
       swipeHeight: 'auto' as any,
       answerAnalysis: '',
+      questionTypeCode: '',
       overResult: {
         time: '00:00', // 时长
         questionLength: 0, // 答题数
@@ -139,6 +140,7 @@ export default defineComponent({
           // 格式化所有题目的答案
           if (index === state.currentIndex) {
             state.answerAnalysis = question.answerAnalysis
+            state.questionTypeCode = question.questionTypeCode
             question.showAnalysis = true
             question.analysis.userResult = data
           }
@@ -498,6 +500,7 @@ export default defineComponent({
           <ErrorMode
             onClose={() => (state.visiableError = false)}
             answerAnalysis={state.answerAnalysis}
+            questionTypeCode={state.questionTypeCode}
             onConform={() => {
               swipeRef.value?.next()
               state.answerAnalysis = ''

src/views/unit-test/unit-detail/index.tsx

@@ -47,6 +47,8 @@ export default defineComponent({
         const temp = questionJson || []
         // 正确答案
         state.answerResult = answerResult ? JSON.parse(answerResult) : []
+
+        console.log(state.answerResult, temp)
         temp.forEach((item: any) => {
           item.userAnswer = formatUserAnswers(item, studentAnswerJson)
           item.showAnalysis = true