修改图片优化

src/components/TestResults/SearchScale.vue

@@ -713,7 +713,7 @@ export default {
 
         .lang-to {
           margin-top: 4px;
-          color: #007EFF;
+          color: #26B600;
         }
       }
 
@@ -744,7 +744,7 @@ export default {
             height: 39px;
 
             th {
-              background-color: #007EFF;
+              background-color: #26B600;
               color: white;
               line-height: 39px;
               font-size: 0.086rem;
@@ -811,14 +811,14 @@ export default {
             .dimension-item-title {
               width: 80px;
               height: 25px;
-              color: #007EFF;
+              color: #26B600;
               text-align: justify;
               text-justify: distribute-all-lines;
             }
 
             .dimension-item-mh {
               width: 30px;
-              color: #007EFF;
+              color: #26B600;
               font-weight: bold;
             }
 

src/components/cognitiveTask/cognitiveTaskReport.vue

@@ -278,7 +278,7 @@ export default {
 
         .lang-to {
           margin-top: 4px;
-          color: #007EFF;
+          color: #26B600;
         }
 
         .total-score {
@@ -324,7 +324,7 @@ export default {
             height: 36px;
 
             th {
-              background-color: #007EFF;
+              background-color: #26B600;
               color: white;
               line-height: 39px;
               font-size: 0.086rem;
@@ -390,14 +390,14 @@ export default {
             .dimension-item-title {
               width: 80px;
               height: 25px;
-              color: #007EFF;
+              color: #26B600;
               text-align: justify;
               text-justify: distribute-all-lines;
             }
 
             .dimension-item-mh {
               width: 30px;
-              color: #007EFF;
+              color: #26B600;
               font-weight: bold;
             }
 

src/components/mainTableItem/index.vue

@@ -178,7 +178,7 @@ export default {
         }
 
         .info {
-          color: #007EFF;
+          color: #26B600;
           // #26B600
           font-size: 18px;
         }

src/components/manage/main/AdminHome.vue

@@ -972,7 +972,7 @@ this.maxTestFlag=res.data.isTestNum;
 .chart-btn.active {
   /* box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12); */
   color: #fff;
-  background: #007EFF;
+  background: #26B600;
 }
 .clearfix {
   /* background-color: #fff; */

src/components/manage/main/CognitiveTaskUserDetail.vue

@@ -373,7 +373,7 @@ export default {
 
         .lang-to {
           margin-top: 4px;
-          color: #007EFF;
+          color: #26B600;
         }
       }
 

src/components/manage/main/SacleList.vue

@@ -209,7 +209,7 @@ export default {
 ::v-deep .el-pager li.active {
   color: #ffffff;
   cursor: default;
-  background-color: #007EFF;
+  background-color: #26B600;
 }
  ::v-deep .el-pagination.is-background .el-pager li {
     margin: 0 5px;

src/components/manage/main/ScaleMgr.vue

@@ -261,7 +261,7 @@ export default {
 ::v-deep .el-pager li.active {
   color: #ffffff;
   cursor: default;
-  background-color: #007EFF;
+  background-color: #26B600;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {

src/components/manage/main/cognitiveTaskMgr.vue

@@ -219,7 +219,7 @@ export default {
 ::v-deep .el-pager li.active {
   color: #ffffff;
   cursor: default;
-  background-color: #007eff;
+  background-color: #26B600;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {

src/components/manage/main/parameterSetting.vue

@@ -241,7 +241,7 @@ export default {
 
   .collapse-title {
     font-size: 0.08rem;
-    color: #007EFF;
+    color: #26B600;
   }
 
   .top-btn {

src/components/manage/main/planHistory.vue

@@ -689,6 +689,6 @@ export default {
   display: none;
 } */
 .b-c {
-  background-color: #007EFF;
+  background-color: #26B600;
 }
 </style>

src/components/manage/main/scaleWarn.vue

@@ -544,7 +544,7 @@ export default {
 ::v-deep .el-pager li.active {
   color: #ffffff;
   cursor: default;
-  background-color: #007EFF;
+  background-color: #26B600;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {

src/components/manage/main/testPlan.vue

@@ -2533,7 +2533,7 @@ export default {
   display: none;
 } */
 .b-c {
-  background-color: #007EFF;
+  background-color: #26B600;
 }
 </style>
 

src/components/tableList/index.vue

@@ -40,7 +40,7 @@ export default {
       height: 36px;
 
       th {
-        background-color: #007EFF;
+        background-color: #26B600;
         color: white;
         line-height: 39px;
         font-size: 0.086rem;

src/router/index.js

@@ -13,8 +13,8 @@ import rememberAbilityTask from "@/views/CognitiveAbilityTask/rememberAbilityTas
 import RhythmDiagnosis from "@/views/CognitiveAbilityTask/rhythmDiagnosis";
 import FERT2experiment from "@/views/CognitiveAbilityTask/FERT2experiment";
 import ECAT from "@/views/CognitiveAbilityTask/ECAT";
-// import EREC from "@/views/CognitiveAbilityTask/EREC";
-// import EMEM from "@/views/CognitiveAbilityTask/EMEM";
+import EREC from "@/views/CognitiveAbilityTask/EREC";
+import EMEM from "@/views/CognitiveAbilityTask/EMEM";
 // import RhythmDiagnosis2 from '@/views/CognitiveAbilityTask/rhythmDiagnosis2'
 import ShapeIntuition from "@/views/CognitiveAbilityTask/shapeIntuition";
 import ShapeIntuition2 from "@/views/CognitiveAbilityTask/shapeIntuition2";
@@ -846,14 +846,14 @@ const routes = [
           keepAlive: false, // 需要被缓存
         },
       },
-      // {
-      //   path: "CognitiveAbilityTask/EREC",
-      //   name: "EREC",
-      //   component: EREC,
-      //   meta: {
-      //     keepAlive: false, // 需要被缓存
-      //   },
-      // },
+      {
+        path: "CognitiveAbilityTask/EREC",
+        name: "EREC",
+        component: EREC,
+        meta: {
+          keepAlive: false, // 需要被缓存
+        },
+      },
       {
         path: "CognitiveAbilityTask/ERECAddiction",
         name: "ERECAddiction",
@@ -862,14 +862,14 @@ const routes = [
           keepAlive: false, // 需要被缓存
         },
       },
-      // {
-      //   path: "CognitiveAbilityTask/EMEM",
-      //   name: "EMEM",
-      //   component: EMEM,
-      //   meta: {
-      //     keepAlive: false, // 需要被缓存
-      //   },
-      // },
+      {
+        path: "CognitiveAbilityTask/EMEM",
+        name: "EMEM",
+        component: EMEM,
+        meta: {
+          keepAlive: false, // 需要被缓存
+        },
+      },
       {
         path: "CognitiveAbilityTask/EMEMAddiction",
         name: "EMEMAddiction",

src/views/CognitiveAbility.vue

@@ -265,7 +265,7 @@ export default {
             line-height: 54px;
             font-size: 14px;
             text-align: right;
-            color: #007EFF;
+            color: #26B600;
           }
         }
 

src/views/CognitiveAbilityTask/ECAT.vue

@@ -48,28 +48,12 @@
       @click.right="userClick('R')"
       @contextmenu.prevent=""
     >
-       <div style="width: 50%; margin-left: 10%; margin-top: 24px">
-          <el-progress
-          class="main_progress"
-            :text-inside="true"
-            :format="format"
-            :stroke-width="24"
-            :percentage="(currentIndex / 59) * 100"
-          ></el-progress>
+      <MainProgress :cur-percentage="currentIndex / 59" />
+      <div class="taskHead">
+        <div class="scale" @click.stop="screen">
+          <img src="@/assets/small-big.png" alt="" />
         </div>
-      <img
-          @click="screen()"
-          src="../../assets/small-big.png"
-          alt=""
-          style="
-            height: 48px;
-            width: 48px;
-            position: fixed;
-            top: 24px;
-            right: 22px;
-            cursor: pointer;
-          "
-        />
+      </div>
       <p
         v-show="showlist"
         style="margin-top: 20%; font-size: 50px; color: black"
@@ -124,8 +108,9 @@ import screenfull from 'screenfull';
 import cognitiveAbilityTaskList from "@/assets/data/cognitiveAbilityData.js";
 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 {
       userId: "",
@@ -628,18 +613,7 @@ export default {
       //   this.$message("您的浏览器不能全屏");
       //   return false;
       // }
-      screenfull.toggle();
-    },
-    exitFullscreen() {
-      if (document.exitFullscreen) {
-        document.exitFullscreen()
-      } else if (document.msExitFullscreen) {
-        document.msExitFullscreen()
-      } else if (document.mozCancelFullScreen) {
-        document.mozCancelFullScreen()
-      } else if (document.webkitExitFullscreen) {
-        document.webkitExitFullscreen()
-      }
+      screenfull.toggle()
     },
     init(taskId) {
       console.log(taskId);
@@ -854,13 +828,13 @@ export default {
             callback: action => {
                 this.$router.push(`/welcome/CognitiveAbilityTask/EREC?testPlanId=${this.testPlanId}`)
             }
-        });
+        })
 
       this.$message({
           message: "测试结束！",
           type: "success",
         });
-      this.exitFullscreen();
+      this.screen()
     },
     videoPlay() {
           let video = document.getElementById("video");

src/views/CognitiveAbilityTask/EMEM.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="content-container">
     <!--       <h1 class="txt-center">任务 5：情绪识别记忆任务（EMEM）——情感信息的记忆</h1>
 
     <div style="width: 650px; margin: 20px auto; line-height: 2">
@@ -7,45 +7,42 @@
         请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些形容词，请你回忆并判断现在呈现的词语是否在实验2中出现过，并按下相应按键。出现过，按鼠标左键表示【是】,没有出现过，按鼠标右键表示【否】。
       </p>
     </div> -->
-    <div class="desc_wrap">
-      <div style="
-          width: 70%;
-          height: 100%;
-          background: rgb(248, 248, 248);
-          opacity: 1;
-          border-radius: 12px;
-          margin: 0 auto;
-        ">
-        <div class="left_part">
-          <div id="left_top">
-            <div>
-              <div id="setting">
-                <img src="../../assets/9551.png" alt="" />
-              </div>
-              <div id="text">
-                <span>操作提示：</span>
-              </div>
-              <div class="voiceBg" :class="{ active: isActive }" @click="videoPlay"></div>
-            </div>
-          </div>
-          <audio id="video" ref="video" :src="require('../../assets/voice/description/description46.mp3')"></audio>
-          <div style="margin: 100px auto; width: 80%; text-align: justify;text-justify: distribute-all-lines;">
-            <!--<p> 请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些形容词，请你回忆并判断现在呈现的词语是否在实验2中出现过，并按下相应按键。出现过，按鼠标左键表示【是】,没有出现过，按鼠标右键表示【否】。</p>-->
-            <!-- <p>{{subjectInfo.description}}</p> -->
-            <p>请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些形容词，请你回忆并判断现在呈现的词语是否在实验2中出现过，并按下相应按键。出现过，按【鼠标左键】，没有出现过，按【鼠标右键】。</p>
-          </div>
+    <div class="content-outline">
+      <div class="left_part">
+        <div id="left_top" class="flex-row">
+          <el-image class="setting" :src="require('@/assets/9551.png')" fit="cover" />
+          <div class="text"> 操作提示：</div>
+          <div
+              class="voiceBg"
+              :class="{ active: isActive }"
+              @click="videoPlay"
+          ></div>
+          <audio id="video" ref="video" :src="require('../../assets/voice/description/description45.mp3')"></audio>
         </div>
-        <div class="right_part" :style="{
+        <div class="left-desc-80">
+          请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些形容词，请你回忆并判断现在呈现的词语是否在实验2中出现过，并按下相应按键。出现过，按【鼠标左键】，没有出现过，按【鼠标右键】。
+        </div>
+      </div>
+      <div
+          class="right_part"
+          :style="{
           background:
             'url(' + require('../../assets/page28.png') + ')',
           'background-size': '100% 100%',
-        }">
-          <div id="title">
-            <span>情绪分类任务（EMEM）</span>
-          </div>
-          <div style="position: absolute; bottom: 30px; right: 38%">
-            <el-button type="primary" class="start" @click="startTest(1)">开始测试</el-button>
-          </div>
+        }"
+      >
+        <div id="title">
+          <span>情绪分类任务（EMEM）</span>
+        </div>
+        <div
+            style="
+            position: absolute;
+            bottom: 0.156rem;
+            left: 50%;
+            transform: translateX(-50%);
+          "
+        >
+          <el-button type="primary" class="start" @click="startTest(1)">开始测试</el-button>
         </div>
       </div>
     </div>
@@ -57,15 +54,14 @@
       <p v-show="countDownShow" class="imgBox1">
         {{ countDownStr }}
       </p>
+      <MainProgress :cur-percentage="currentIndex / 59" />
 
-      <div style="width: 50%; margin-left: 10%; margin-top: 24px">
-        <el-progress class="main_progress" :text-inside="true" :format="format" :stroke-width="24"
-          :percentage="(currentIndex / 59) * 100"></el-progress>
+      <div class="taskHead">
+        <div class="scale" @click.stop="screen">
+          <img src="@/assets/small-big.png" alt="" />
+        </div>
       </div>
 
-      <div style="padding:20px;margin-left:93%;" @click.stop="screen()">
-        <img src="../../assets/small-big.png" alt="" />
-      </div>
       <p v-show="showlist" style="margin-top: 20%; font-size: 50px; color: black">
         {{ wordlist[currentIndex].currentword }}
       </p>
@@ -112,7 +108,9 @@
 import screenfull from 'screenfull';
 import cognitiveAbilityTaskList from "@/assets/data/cognitiveAbilityData.js";
 import { oSessionStorage } from "@/utils/utils";
+import MainProgress from "@/components/MainProgress/index.vue";
 export default {
+  components: {MainProgress},
   data() {
     return {
       countDownStr: "马上开始！",

src/views/CognitiveAbilityTask/EREC.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="content-container">
     <!--   <h1 class="txt-center">任务 4：情绪回忆任务（EREC）——情感信息的记忆</h1>
 
     <div style="width: 650px; margin: 20px auto; line-height: 2">
@@ -7,59 +7,42 @@
         您好，请尽可能多地回忆在实验2中出现过的相容词，并于一定时间内在屏幕中的输入框处逐个进行输入，每输入一个形容词时请按下回车键或点击白框空白处保存当前形容词，点击右上角×号可删除已输入形容词，当您回忆完成后，可点击保存进入下一个测试。
       </p>
     </div> -->
-    <div class="desc_wrap">
+    <div class="content-outline">
+      <div class="left_part">
+        <div id="left_top" class="flex-row">
+          <el-image class="setting" :src="require('@/assets/9551.png')" fit="cover" />
+          <div class="text"> 操作提示：</div>
+          <div
+              class="voiceBg"
+              :class="{ active: isActive }"
+              @click="videoPlay"
+          ></div>
+          <audio id="video" ref="video" :src="require('../../assets/voice/description/description45.mp3')"></audio>
+        </div>
+        <div class="left-desc-80">
+          你好，请尽可能多地回忆在词汇分类任务中出现过的相容词，并于一定时间内在屏幕中的空白框处输入。
+        </div>
+      </div>
       <div
-        style="
-          width: 70%;
-          height: 100%;
-          background: rgb(248, 248, 248);
-          opacity: 1;
-          border-radius: 12px;
-          margin: 0 auto;
-        "
+          class="right_part"
+          :style="{
+          background:
+            'url(' + require('../../assets/page28.png') + ')',
+          'background-size': '100% 100%',
+        }"
       >
-        <div class="left_part">
-          <div id="left_top">
-            <div>
-              <div id="setting">
-                <img src="../../assets/9551.png" alt="" />
-              </div>
-              <div id="text">
-                <span>操作提示：</span>
-              </div>
-              <div
-                class="voiceBg"
-                :class="{ active: isActive }"
-                @click="videoPlay"
-              ></div>
-            </div>
-          </div>
-          <audio
-            id="video"
-            ref="video"
-            :src="require('../../assets/voice/description/description45.mp3')"
-          ></audio>
-          <div style="margin: 100px auto; width: 80%; text-align: justify;text-justify: distribute-all-lines;">
-            <!--<p>您好，请尽可能多地回忆在实验2中出现过的相容词，并于一定时间内在屏幕中的输入框处逐个进行输入，每输入一个形容词时请按下回车键或点击白框空白处保存当前形容词，点击右上角“x”号按钮可删除已输入形容词，当您回忆完成后，可点击保存进入下一个测试。</p>-->
-            <!-- <p>{{subjectInfo.description}}</p> -->
-            <p>
-              你好，请尽可能多地回忆在词汇分类任务中出现过的相容词，并于一定时间内在屏幕中的空白框处输入。
-            </p>
-          </div>
+        <div id="title">
+          <span>情绪识别记忆任务（EREC）</span>
         </div>
         <div
-          class="right_part"
-          :style="{
-            background: 'url(' + require('../../assets/page28.png') + ')',
-            'background-size': '100% 100%',
-          }"
+            style="
+            position: absolute;
+            bottom: 0.156rem;
+            left: 50%;
+            transform: translateX(-50%);
+          "
         >
-          <div id="title">
-            <span>情绪识别记忆任务（EREC）</span>
-          </div>
-          <div style="position: absolute; bottom: 30px; right: 38%">
-            <el-button type="primary" class="start" @click="startTest(1)">开始测试</el-button>
-          </div>
+          <el-button type="primary" class="start" @click="startTest(1)">开始测试</el-button>
         </div>
       </div>
     </div>

src/views/CognitiveAbilityTask/ETBexperiment_new.vue

@@ -156,7 +156,7 @@ export default {
       commonTime: 0, //计时器获取反应时间
       cumulation: 0, //累加器
       examImgUrl: "", //展示图片
-      arrList: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], //取样数组
+      arrList: ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10"], //取样数组
       randomArr: [], //从十个人中随机获取3个人
       resultData: [
         // {
@@ -177,6 +177,8 @@ export default {
         { name: "悲伤", val: "sad" },
         { name: "惊讶", val: "surprise" },
       ],
+
+      baseUrlPort: ''
     };
   },
   // 页面初始化函数
@@ -187,6 +189,7 @@ export default {
     this.testMode = this.$route.query.testMode;
   },
   mounted() {
+    this.baseUrlPort = window.location.origin
     // this.imgListSerialize();
     //进入页面即初始化开始测试
     console.log(this.testMode);
@@ -307,7 +310,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-happy-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`, //图片地址
         });
         //害怕
         this.resultData.push({
@@ -316,7 +319,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         //生气
         this.resultData.push({
@@ -325,7 +328,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-angry-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         //厌恶
         this.resultData.push({
@@ -334,7 +337,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-disgust-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         // 悲伤
         this.resultData.push({
@@ -343,7 +346,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-sad-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
         // 惊讶
         this.resultData.push({
@@ -352,7 +355,7 @@ export default {
           userSelectEmoType: "", //用户选择的情绪类型
           responseTime: "", //反应时（ms）
           correct: "", //用户反映正确性 True, False
-          imgUrl: `http://localhost:8080/static/assets/ETBnew/${item}-surprise-${rank + 1}.jpg`, //图片地址
+          imgUrl: `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`,
         });
       });
     },

src/views/CognitiveAbilityTask/face_dot.vue

@@ -64,7 +64,7 @@ export default {
       crossShow: false, //注释点+显示
       expressionShow: false, //表情图片对显示
       dotShow: false, //选项点显示
-      arrList: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], //取样数组
+      arrList: ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10"], //取样数组
       randomArr: [], //十个人全取加2个随机人
       blockList1: [], //block数据1
       blockList2: [], //block数据2
@@ -84,6 +84,8 @@ export default {
       topImg: "", //上边图片
       bottomImg: "", //下边图片
       isLoading: false,
+
+      baseUrlPort: ''
     };
   },
   // 页面初始化函数
@@ -93,6 +95,7 @@ export default {
     this.banClickVoice = new Audio(require("../../assets/ban.mp3"));
   },
   mounted() {
+    this.baseUrlPort = window.location.origin
     //进入页面即初始化开始测试
     this.startTest();
   },
@@ -236,12 +239,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/${ (Number(item) > 5 ? 'm' : 'f') + 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/${ (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`
         });
         //害怕-1
         this.blockList1.push({
@@ -255,12 +258,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-fear-${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/${ (Number(item) > 5 ? 'm' : 'f') + item}-neutral.jpg`, //图片地址
           bottomImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
-              : `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}.jpg`
+              ? `${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`
         });
         //开心-2
         this.blockList2.push({
@@ -274,12 +277,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-happy-${rank + 1}-jumble.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)}-jumble.jpg`
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + 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}-jumble.jpg`
+              ? `${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)}-jumble.jpg`
         });
         //害怕-2
         this.blockList2.push({
@@ -293,12 +296,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //点位置0-上，1-下
           topImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}-jumble.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)}-jumble.jpg`
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-neutral.jpg`, //图片地址
           bottomImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
-              : `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}-jumble.jpg`
+              ? `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-neutral.jpg` //图片地址
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-fear-${rank > 8 ? rank + 1 : '0' + (rank + 1)}-jumble.jpg`
         });
       });
     },
@@ -314,13 +317,13 @@ export default {
     },
     async imgListSerialize() {
       // 按情绪等级图片数组序列化
-      await this.initImgList(0);
-      await this.initImgList(1);
-      await this.initImgList(2);
-      await this.initImgList(3);
+      await this.initImgList(0)
+      await this.initImgList(1)
+      await this.initImgList(2)
+      await this.initImgList(3)
       //打乱数组序列
-      await this.shuffle(this.blockList1);
-      await this.shuffle(this.blockList2);
+      await this.shuffle(this.blockList1)
+      await this.shuffle(this.blockList2)
       //图片数组添加序列号
       this.blockList1.map((item, i) => {
         return (item.index = i);
@@ -329,8 +332,8 @@ export default {
         return (item.index = i);
       });
       // 图片预加载
-      await this.imgsPreloader(this.blockList1);
-      await this.imgsPreloader(this.blockList2);
+      await this.imgsPreloader(this.blockList1)
+      await this.imgsPreloader(this.blockList2)
 
       // 初始化图片完成后开始倒计时进入测试
       // this.countDown();

src/views/CognitiveAbilityTask/facedotChildren.vue

@@ -69,7 +69,7 @@ export default {
       crossShow: false, //注释点+显示
       expressionShow: false, //表情图片对显示
       dotShow: false, //选项点显示
-      arrList: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"], //取样数组
+      arrList: ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10"], //取样数组
       randomArr: [], //十个人全取加2个随机人
       blockList1: [], //block数据1
       currentIndex: 0, //当前需要显示的图片点索引值
@@ -88,6 +88,8 @@ export default {
       startTime: 0,
       topImg: "", //上边图片
       bottomImg: "", //下边图片
+
+      baseUrlPort: ''
     };
   },
   // 页面初始化函数
@@ -97,6 +99,7 @@ export default {
     this.banClickVoice = new Audio(require("../../assets/ban.mp3"));
   },
   mounted() {
+    this.baseUrlPort = window.location.origin
     //进入页面即初始化开始测试
     this.startTest();
 
@@ -274,12 +277,12 @@ export default {
           dotPos: index >= 6 ? "0" : "1", //0-上，1-下
           topImg:
             index % 2 == 0
-              ? `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}.jpg`
+              ? `${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`, //图片地址
           bottomImg:
             index % 2 == 0
               ? `http://localhost:8080/static/assets/ETBnew/${item}-neutral.jpg` //图片地址
-              : `http://localhost:8080/static/assets/ETBnew/${item}-fear-${rank + 1}.jpg`
+              : `${this.baseUrlPort}/static/assets/ETBnew/${ (Number(item) > 5 ? 'm' : 'f') + item}-happy-${rank > 8 ? rank + 1 : '0' + (rank + 1)}.jpg`
         });
       });
     },

src/views/PersionDetail.vue

@@ -625,7 +625,7 @@ export default {
 
         .lang-to {
           margin-top: 4px;
-          color: #007EFF;
+          color: #26B600;
         }
       }
 

src/views/PersonalCenter.vue

@@ -447,7 +447,7 @@ export default {
           font-size: 0.086rem;
           font-weight: 400;
           line-height: 20px;
-          color: #007EFF;
+          color: #26B600;
           cursor: pointer;
         }
       }

src/views/TestPlan.vue

@@ -371,7 +371,7 @@ export default {
             justify-content: space-between;
 
             .end-time {
-              color: #007EFF;
+              color: #26B600;
               font-size: 0.083rem;
             }