BUG修改

src/router/index.js

@@ -1299,14 +1299,14 @@ const routes = [
       //     keepAlive: false, // 需要被缓存
       //   },
       // },
-      // {
-      //   path: "CognitiveAbilityTask/visualSpatialMemory",
-      //   name: "visualSpatialMemory",
-      //   component: () => import('@/views/CognitiveAbilityTask/visualSpatialMemory'),
-      //   meta: {
-      //     keepAlive: false, // 需要被缓存
-      //   },
-      // },
+      {
+        path: "CognitiveAbilityTask/visualSpatialMemory",
+        name: "visualSpatialMemory",
+        component: () => import('@/views/CognitiveAbilityTask/visualSpatialMemory'),
+        meta: {
+          keepAlive: false, // 需要被缓存
+        },
+      },
       {
         path: "CognitiveAbilityTask/prospectRecall",
         name: "prospectRecall",

src/style/public.scss

@@ -52,7 +52,7 @@
   box-shadow: 0px 3px 6px rgb(0, 0, 0);
   border-radius: 12px;
   position: relative;
-  margin: 5vh auto 10vh;
+  margin: 10vh auto;
 }
 
 /* 任务介绍样式 */

src/views/CognitiveAbilityTask/ETBexperiment_new.vue

@@ -319,7 +319,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         //生气
         this.resultData.push({
@@ -328,7 +328,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-angry-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         //厌恶
         this.resultData.push({
@@ -337,7 +337,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-disgust-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         // 悲伤
         this.resultData.push({
@@ -346,7 +346,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-sad-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         // 惊讶
         this.resultData.push({
@@ -355,7 +355,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-surprise-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
       });
     },

src/views/CognitiveAbilityTask/StroopTask.vue

@@ -53,20 +53,14 @@
       @click.left="userClick('L')"
       @click.right="userClick('R')"
     >
+      <MainProgress v-if="isok" :cur-percentage="currentIndex / countLevel" />
+
       <div class="taskHead">
         <div class="scale" @click.stop="screen">
           <img src="../../assets/small-big.png" alt="" />
         </div>
-        <el-progress
-          class="main_progress"
-          v-if="isok"
-          :text-inside="true"
-          :format="format"
-          :stroke-width="24"
-          :percentage="(currentIndex / countLevel) * 100"
-          style="width: 50%"
-        ></el-progress>
       </div>
+
       <div class="glass">
         <div v-show="showAdd" class="arrowModule">
           <div class="bgAdd"></div>
@@ -95,9 +89,10 @@
 import { oSessionStorage } from "../../utils/utils"
 import screenfull from "screenfull"
 import GoBack from "@/components/goBack/index.vue"
+import MainProgress from "@/components/MainProgress/index.vue";
 
 export default {
-  components: { GoBack },
+  components: {MainProgress, GoBack },
   data() {
     return {
       isok: false,

src/views/CognitiveAbilityTask/comprehensiveMemoryAbilityEnter.vue

@@ -32,12 +32,17 @@
                 <p style="color: rgb(87, 172, 187)">(七)前瞻记忆</p>
             </div>
         </div>
+
+      <go-back />
     </div>
 </template>
 
 <script>
+import GoBack from "@/components/goBack/index.vue";
+
 export default {
     name: "comprehensiveMemoryAbilityEnter",
+  components: {GoBack},
     data() {
         return {
             subjectInfo: "",

src/views/CognitiveAbilityTask/continueAdditionTask.vue

@@ -83,27 +83,29 @@
       <!-- <h1 class="txt-center" style="color: rgb(231, 226, 226); font-size: 52px">
         {{ showSpanText }}
       </h1> -->
-      <div v-if="answerButtonShow" style="" class="txt-center add-mid">
-        <div>
-          <p align="center" style="padding-bottom: 20px; padding-top: 100px">
-            <span class="bn-in"> {{ showSpanText }}</span>
-          </p>
-          <el-button class="oneBu bn-bottom" @click="userClick(1)">1</el-button>
-          <el-button class="oneBu bn-bottom" @click="userClick(2)">2</el-button>
-          <el-button class="bn-bottom" @click="userClick(3)">3</el-button>
+      <div v-if="answerButtonShow" style="" class="txt-center">
+        <div align="center" style="padding-bottom: 20px; padding-top: 100px">
+          <span class="bn-in"> {{ showSpanText }}</span>
         </div>
-        <div style="margin-top: 10px">
-          <el-button class="oneBu bn-bottom" @click="userClick(4)">4</el-button>
-          <el-button class="oneBu bn-bottom" @click="userClick(5)">5</el-button>
-          <el-button class="bn-bottom" @click="userClick(6)">6</el-button>
-        </div>
-        <div style="margin-top: 10px">
-          <el-button class="oneBu bn-bottom" @click="userClick(7)">7</el-button>
-          <el-button class="oneBu bn-bottom" @click="userClick(8)">8</el-button>
-          <el-button class="bn-bottom" @click="userClick(9)">9</el-button>
-        </div>
-        <div style="margin-top: 10px">
-          <el-button class="bn-bottom" @click="userClick(0)">0</el-button>
+        <div class="add-mid">
+          <div style="margin-top: 10px">
+            <el-button class="oneBu bn-bottom" @click="userClick(1)">1</el-button>
+            <el-button class="oneBu bn-bottom" @click="userClick(2)">2</el-button>
+            <el-button class="bn-bottom" @click="userClick(3)">3</el-button>
+          </div>
+          <div style="margin-top: 10px">
+            <el-button class="oneBu bn-bottom" @click="userClick(4)">4</el-button>
+            <el-button class="oneBu bn-bottom" @click="userClick(5)">5</el-button>
+            <el-button class="bn-bottom" @click="userClick(6)">6</el-button>
+          </div>
+          <div style="margin-top: 10px">
+            <el-button class="oneBu bn-bottom" @click="userClick(7)">7</el-button>
+            <el-button class="oneBu bn-bottom" @click="userClick(8)">8</el-button>
+            <el-button class="bn-bottom" @click="userClick(9)">9</el-button>
+          </div>
+          <div style="margin-top: 10px">
+            <el-button class="bn-bottom" @click="userClick(0)">0</el-button>
+          </div>
         </div>
       </div>
     </div>
@@ -551,10 +553,10 @@ export default {
   background-size: cover;
 }
 .add-mid {
-  background: url(../../assets/congnitiveAblitity/add-mid.png) no-repeat center;
-  /* background-size: cover; */
-  height: 720px;
-  /* width:225px; */
+  background: url('~@/assets/congnitiveAblitity/add-mid.png') no-repeat 0 0 / 100% 100%;
+  height: 470px;
+  width: 425px;
+  margin: 20px auto 0;
 }
 h1 {
   font-size: 2em;

src/views/CognitiveAbilityTask/face_dot.vue

@@ -258,12 +258,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
+              ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
               : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-neutral.jpg`, //图片地址
           bottomImg:
             index % 2 == 0
               ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-neutral.jpg` //图片地址
-              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
         });
         //开心-2
         this.blockList2.push({

src/views/CognitiveAbilityTask/facedotChildren.vue

@@ -258,12 +258,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-happy-${rank + 1}.jpg`
-              : `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg`, //图片地址
+                ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
+                : `${this.baseUrlPort}/static/assets/ETBnew/${item}-neutral.jpg`, //图片地址
           bottomImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
-              : `http://localhost:8080/static/assets/ETBnew/${item}-happy-${rank + 1}.jpg`
+                ? `${this.baseUrlPort}/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
+                : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
         });
         //害怕-1
         this.blockList1.push({
@@ -277,12 +277,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
-              : `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg`, //图片地址
+              ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
+              : `${this.baseUrlPort}/static/assets/ETBnew/${item}-neutral.jpg`, //图片地址
           bottomImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
-              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
+              ? `${this.baseUrlPort}/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
         });
       });
     },

src/views/CognitiveAbilityTask/imageAssociation.vue

@@ -17,20 +17,12 @@
     }"
             v-if="quest == true"
     >
-        <img
-                @click="screenState()"
-                src="../../assets/small-big.png"
-                alt=""
-                style="
-        z-index:9999;
-        height: 48px;
-        width: 48px;
-        position: fixed;
-        top: 24px;
-        right: 22px;
-        cursor: pointer;
-      "
-        />
+        <div class="taskHead">
+          <div class="scale" @click.stop="screen">
+            <img src="../../assets/small-big.png" alt="" />
+          </div>
+        </div>
+
         <div
                 :class="{
         glass: !(
@@ -49,11 +41,11 @@
                     <div
                             style="
               height: 36px;
+              line-height: 36px;
               background: rgba(0, 0, 0, 0.39);
 
               border-radius: 24px;
               color: #ffffff;
-              padding-top: 10px;
               margin-right: 100px;
               padding-right: 10px;
             "
@@ -78,7 +70,7 @@
                     注释：包括15对动物-水果图片，需要被试记住每个动物或是水果相对应的另一个动物或是水果，图片对将会展现两次，每个图片对各展示10秒，展示结束后进行即时回忆测查/即时再认测查，需要被试在看到图片后，大声迅速的报告与之对应的动物或者水果图片名称；再认测查会先出现动物图片，随后出现4张水果图片，其中1张为正确答案。30分钟后可进行延迟回忆测查/延迟再认测查。
                 </p>
             </el-card>
-            <div v-if="isDelay == true && isok == false">
+            <div v-if="isDelay && !isok ">
                 <h1 v-if="countDownDivShow" style="margin-top: 5rem;text-align: center">
                     延时测试剩余时间:{{ remainingTime }}分钟
                 </h1>
@@ -112,16 +104,14 @@
                     </div>
                 </div>
 
-                <el-button v-if="isclick == false" class="sta-bn" @click.once="learn"
-                >开始学习</el-button
-                >
+                <el-button v-if="isclick == false" class="sta-bn" @click.once="learn">开始学习</el-button>
             </div>
         </div>
 
         <h1
                 v-if="
-        (!flag1 && !flag2 && isDelay == true && isok == true) ||
-        (flag2 && isDelay == true && isok == true)
+        (!flag1 && !flag2 && isDelay && isok) ||
+        (flag2 && isDelay && isok)
       "
         >
             延时测试
@@ -1089,11 +1079,7 @@
                     </div>
                 </div>
             </div>
-            <el-divider></el-divider>
-            <div class="txt-center">
-                <!--<el-button style="margin-bottom: 40px" class='saveCll' @click="save2">保存</el-button>-->
-                <el-button style="margin-bottom: 40px" class='saveCll' @click="throttle">保存</el-button>
-            </div>
+          <el-button class='saveCll' @click="throttle">保存</el-button>
         </div>
     </div>
 </template>
@@ -1626,7 +1612,7 @@
                 //退出测试
                 this.$router.push("/welcome/CognitiveAbility");
             },
-            screenState() {
+            screen() {
                 screenfull.toggle();
             },
             internetQuest() {
@@ -2373,7 +2359,7 @@
 
     .grid-content {
         border-radius: 4px;
-        height: 120px;
+        height: 110px;
         width: 120px;
         background-color: inherit;
     }
@@ -2492,7 +2478,7 @@
         width: 120px;
         height: 120px;
         float: right;
-        margin-top: 30px;
+        margin-top: 20px;
         margin-right: 10px;
     }
     .it211 {
@@ -2581,6 +2567,9 @@
         width: 120px;
     }
     .saveCll {
+      position: absolute;
+      right: 16px;
+      bottom: 32px;
         width: 170px;
         height: 48px;
         background: rgb(87, 172, 187);
@@ -2588,6 +2577,7 @@
         box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
         opacity: 1;
         border-radius: 39px;
+      color: white;
     }
     .saveclass {
         background: rgb(87, 172, 187);
@@ -2605,4 +2595,10 @@
         flex-direction: row;
         justify-content: center;
     }
+
+
+    .taskHead {
+      right: 16px;
+      top: 24px;
+    }
 </style>

src/views/CognitiveAbilityTask/movementPerception.vue

@@ -52,20 +52,14 @@
       :class="{ testMainDivMove: !testState, activeTaskMove: testState }"
       class="txt-center"
     >
+      <MainProgress :cur-percentage="imgIndex / 72" />
+
       <div class="taskHead">
         <div class="scale" @click.stop="screen">
           <img src="../../assets/small-big.png" alt="" />
         </div>
-        <el-progress
-          class="main_progress"
-          :text-inside="true"
-          :format="format"
-          :stroke-width="24"
-          :percentage="(imgIndex / 72) * 100"
-          v-if="testTypeCode == 1"
-          style="width: 50%"
-        ></el-progress>
       </div>
+
       <div class="glass">
         <p v-show="countDownShow" class="countdownStr">
           {{ countDownStr }}
@@ -94,9 +88,10 @@ import cognitiveAbilityTaskList from "@/assets/data/cognitiveAbilityData.js";
 import { oSessionStorage, preloader } from "@/utils/utils";
 import screenfull from "screenfull";
 import GoBack from "@/components/goBack/index.vue";
+import MainProgress from "@/components/MainProgress/index.vue";
 
 export default {
-  components: {GoBack},
+  components: {MainProgress, GoBack},
   data() {
     return {
       userId: "",

src/views/CognitiveAbilityTask/rememberAbilityTask.vue

@@ -27,13 +27,15 @@
       </div>
     </div>
     <div v-if="testFlag" :class="{ testMainDiv: !testState, activeTask: testState }" @click="userClick()">
+
+      <MainProgress v-if="testTypeCode == 1" :cur-percentage="count / 114" />
+
       <div class="taskHead">
         <div class="scale" @click.stop="screen">
           <img src="../../assets/small-big.png" alt="" />
         </div>
-        <el-progress class="main_progress" v-if="testTypeCode == 1" :text-inside="true" :format="format"
-          :stroke-width="24" :percentage="(count / 114) * 100" style="width: 50%"></el-progress>
       </div>
+
       <div class="glass">
         <h1 class="txt-center" style="margin-top: 30px; color: rgba(240, 248, 255, 1)">
           ({{ nbackIndex }}-back)
@@ -66,9 +68,10 @@
 import screenfull from "screenfull";
 import { oSessionStorage } from "../../utils/utils";
 import GoBack from "@/components/goBack/index.vue"
+import MainProgress from "@/components/MainProgress/index.vue";
 
 export default {
-  components: { GoBack },
+  components: {MainProgress, GoBack },
   data() {
     return {
       countDownTime: 8, //倒计时时长

src/views/CognitiveAbilityTask/visualSpatialMemory.vue

@@ -1,18 +1,12 @@
 <template>
     <div class="bd activeTask">
-        <img
-                @click="screenState()"
-                src="../../assets/small-big.png"
-                alt=""
-                style="
-        height: 48px;
-        width: 48px;
-        position: fixed;
-        top: 24px;
-        right: 22px;
-        cursor: pointer;
-      "
-        />
+
+      <div class="taskHead">
+        <div class="scale" @click.stop="screenState">
+          <img src="../../assets/small-big.png" alt="" />
+        </div>
+      </div>
+
         <div class="glass">
             <div>
                 <el-row>
@@ -743,7 +737,7 @@
         border: 3px solid rgb(255, 255, 255);
         box-shadow: 0px 3px 6px rgba(255, 255, 255);
         border-radius: 12px;
-        margin: 1vh auto;
+        margin: 10vh auto;
         position: relative;
         padding-top: 6px;
     }