Browse Source

Merge branch 'refs/heads/20240604-dev' into 20240904-zyy

# Conflicts:
#	src/views/tester/components/RehabilitationEvaluation/CognitiveAbilityTask/CognitiveAbilityTaskVisualTraining/index.vue
周玉佂 1 week ago
parent
commit
341f66f87c

+ 13 - 10
src/views/tester/components/RehabilitationEvaluation/CognitiveAbilityTask/CognitiveAbilityTaskVisualTraining/index.vue

@@ -21,21 +21,23 @@
         <!--模式选择-->
         <div v-if="modeSelect === -1" class="absolute wh-full top-0 left-0 bg-[#ffffff9f] z-3999 flex-center">
           <div class="choice-bg w-800px h-400px flex-center flex-col">
-            <span class="inline-block text-45px text-black mb-36px mt-28px">请选择任务模式:</span>
+            <span class="inline-block text-45px text-black mb-36px mt-28px">请选择任务模式:</span>
             <div class="flex flex-row w-76% justify-between mt-18px">
               <el-image
+                v-if="!isMainWin"
                 src="/static/image/cognitiveAbility/SpeechTraining/tips-one.png"
                 fit="contain"
                 class="w-[280px] h-[90px] cursor-pointer"
                 :class="{ 'scale-113': modeActive === 0 }"
-                @click="modeSelectFn(0, isMainWin ? 1 : 0)"
+                @click="modeSelectFn(0)"
               />
               <el-image
+                v-if="!isMainWin"
                 src="/static/image/cognitiveAbility/SpeechTraining/tips-all.png"
                 fit="contain"
                 class="w-[280px] h-[90px] cursor-pointer"
                 :class="{ 'scale-113': modeActive === 1 }"
-                @click="modeSelectFn(1, isMainWin ? 1 : 0)"
+                @click="modeSelectFn(1)"
               />
             </div>
           </div>
@@ -49,9 +51,9 @@
           <div
             v-for="(item, index) in checkItems"
             :key="index"
-            class="w-[300px] h-[70px] flex-center fw-700 text-[34px] color-[#ffffff] mb-[18px] cursor-pointer hover:scale-102"
+            class="w-[300px] h-[70px] flex-center fw-700 text-[38px] color-[#ffffff] mb-[18px] cursor-pointer hover:scale-102"
             :class="[item.active ? 'active' : 'normal']"
-            @click="checkItemFn(item, isMainWin ? 1 : 0)"
+            @click="checkItemFn(item, index)"
           >
             {{ item.name }}
           </div>
@@ -64,9 +66,9 @@
         />
       </div>
     </div>
-    <div>
-      <Word-word v-if="gameActive === '1'" />
-    </div>
+
+    <Word-word v-if="gameActive === '1'" />
+
     <VoiceImp ref="VoiceImpRef" />
   </section>
 </template>
@@ -184,10 +186,11 @@ const modeSelectFn = useThrottleFn((mode: number, flag: number = 0) => {
   }, 800)
 })
 
-const startTask = useThrottleFn(() => {
+const startTask = () => {
+  // TODO 开始任务
   gameActive.value = itemActive.value
   console.log('开始任务', gameActive.value)
-})
+}
 
 const countDownEnd = () => {
   countDownBegin.value = false