BUG修改

src/views/CognitiveAbilityTask/lexicalAssociation.vue

@@ -1,18 +1,11 @@
 <template>
-    <div id="bd " class="activeTask" v-if="quest == true">
-        <img
-                @click="screenState()"
-                src="../../assets/small-big.png"
-                alt=""
-                style="
-        height: 48px;
-        width: 48px;
-        position: fixed;
-        top: 24px;
-        right: 22px;
-        cursor: pointer;
-      "
-        />
+    <div id="bd " class="activeTask" v-if="quest">
+      <div class="taskHead">
+        <div class="scale" @click.stop="screenState">
+          <img src="../../assets/small-big.png" alt="" />
+        </div>
+      </div>
+
         <div class="glass">
             <div style="width: 92%; margin-left: 4%">
                 <el-row>
@@ -22,12 +15,13 @@
                                 id="t1"
                                 style="
                 margin-left: 58%;
-                height: 36px;
+                font-size: 28px;
+                padding: 4px 8px;
                 background: rgba(0, 0, 0, 0.39);
-                margin-bottom:10px;
+                margin-bottom: 10px;
                 border-radius: 24px;
+                text-align: center;
                 color: #ffffff;
-                padding-top: 10px;
               "
                                 v-if="
                                     (isComplete == 0 && isDelay == false && isok == false) ||
@@ -100,7 +94,7 @@
                 <div style="text-align: left">
                     <el-button
                             id="btn2"
-                            icon="el-icon-video-play"
+                            :icon="icon1"
                             @click.once="autoAudio1"
                     >第一组</el-button>
                 </div>
@@ -109,7 +103,7 @@
                     <el-button
                             id="btn4"
                             :disabled="complete"
-                            icon="el-icon-video-play"
+                            :icon="icon2"
                             @click.once="autoAudio2"
                     >第二组</el-button>
                 </div>
@@ -219,14 +213,19 @@
 
             </div>
         </div>
+
+      <go-back />
     </div>
 </template>
 
 <script>
     import screenfull from "screenfull";
+    import MainProgress from "@/components/MainProgress/index.vue";
+    import GoBack from "@/components/goBack/index.vue";
 
     export default {
         name: "lexicalAssociation",
+      components: { GoBack, MainProgress },
         data() {
             return {
                 complete: true,
@@ -302,6 +301,9 @@
                 wholeProcess: "1", //0-流程测试1-分项测试是否进行全流程测试
                 isImmediate: "0", //是否是即时测试，0-不是即时，1-即时测试
                 throttleTimer: null,
+
+              icon1: 'el-icon-video-play',
+              icon2: 'el-icon-video-play',
             };
         },
 
@@ -740,6 +742,7 @@
                 // setTimeout(function () {
                 //     _this.complete = false;
                 // }, 20000);
+              this.icon1 = this.icon1 === 'el-icon-video-play' ? 'el-icon-video-pause' : 'el-icon-video-play';
 
                 this.handlePlay(this.logicAudioArr,1);
             },
@@ -754,6 +757,7 @@
                 // setTimeout(function () {
                 //     _this.showButton = true;
                 // }, 20000);
+              this.icon2 = this.icon2 === 'el-icon-video-play' ? 'el-icon-video-pause' : 'el-icon-video-play';
 
                 this.handlePlay(this.nologicAudioArr,2);
 
@@ -903,9 +907,9 @@
         /* height: 593px; */
         background: rgba(255, 255, 255, 0.41);
         border: 3px solid rgb(255, 255, 255);
-        box-shadow: 0px 3px 6px rgb(255, 255, 255);
+        box-shadow: 0 3px 6px rgb(255, 255, 255);
         border-radius: 12px;
-        margin: 1vh auto;
+        margin: 8vh auto 0;
         position: relative;
         padding-top: 6px;
     }

src/views/CognitiveAbilityTask/movementPerception.vue

@@ -23,7 +23,7 @@
         <div
           style="
             position: absolute;
-            bottom: 30px;
+            bottom: 0.156rem;
             left: 50%;
             transform: translateX(-50%);
           "
@@ -52,7 +52,7 @@
       :class="{ testMainDivMove: !testState, activeTaskMove: testState }"
       class="txt-center"
     >
-      <MainProgress :cur-percentage="imgIndex / 72" />
+      <MainProgress v-if="testTypeCode == 1" :cur-percentage="imgIndex / 72" />
 
       <div class="taskHead">
         <div class="scale" @click.stop="screen">

src/views/CognitiveAbilityTask/pointMemory.vue

@@ -1,18 +1,11 @@
 <template>
-    <div id="bd" class="txt-center activeTask" v-if="quest == true">
-        <img
-                @click="screenState()"
-                src="../../assets/small-big.png"
-                alt=""
-                style="
-        height: 48px;
-        width: 48px;
-        position: fixed;
-        top: 24px;
-        right: 22px;
-        cursor: pointer;
-      "
-        />
+    <div id="bd" class="txt-center activeTask" v-if="quest">
+      <div class="taskHead">
+        <div class="scale" @click.stop="screenState">
+          <img src="../../assets/small-big.png" alt="" />
+        </div>
+      </div>
+
         <div class="glass">
             <div style="width: 92%; margin-left: 4%">
                 <el-row>
@@ -22,14 +15,15 @@
                         <div
                                 id="t1"
                                 style="
-                margin-left: 58%;
-                height: 36px;
-                background: rgba(0, 0, 0, 0.39);
-
-                border-radius: 24px;
-                color: #ffffff;
-                padding-top: 10px;
-              "
+                                  margin-left: 58%;
+                                  font-size: 28px;
+                                  padding: 4px 8px;
+                                  background: rgba(0, 0, 0, 0.39);
+                                  margin-bottom: 10px;
+                                  border-radius: 24px;
+                                  text-align: center;
+                                  color: #ffffff;
+                                "
                                 v-if="
                                     (isfruit == 0 && isDelay == false && isok == false) ||
                                     (isfruit == 0 && isDelay == true && isok == true)
@@ -207,14 +201,17 @@
                 @click="throttle"
         >保&nbsp;&nbsp;存</el-button>
 
+      <go-back />
     </div>
 </template>
 
 <script>
     import screenfull from "screenfull";
+    import GoBack from "@/components/goBack/index.vue";
 
     export default {
         name: "pointMemory",
+      components: { GoBack },
         data() {
             return {
                 fruit_flag:'',