src/views/CognitiveAbilityTask/goNogoTask.vue

@@ -1,44 +1,40 @@
 <template>
-  <div>
+  <div class="content-container">
     <!-- LOGO  -->
-    <div class="desc_wrap" v-if="!userFinalTestStrShow">
-      <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>
-          </div>
-          <div style="margin: 100px auto; width: 80%; text-align: justify;text-justify: distribute-all-lines;">
-            <p v-html="subjectInfo.testDescription"></p>
-            <!-- <p>{{subjectInfo.description}}</p> -->
-          </div>
+    <div class="content-outline" v-if="!userFinalTestStrShow">
+      <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>
-        <div class="right_part" :style="{
+        <!--          <audio-->
+        <!--              id="audio1"-->
+        <!--              src="../../assets/voice/description/description00.mp3"-->
+        <!--          ></audio>-->
+        <div class="left-desc-80" v-html="subjectInfo.testDescription"></div>
+      </div>
+      <div
+          class="right_part"
+          :style="{
           background:
             'url(' + require('../../assets/page' + taskId + '.png') + ')',
           'background-size': '100% 100%',
-        }">
-          <div id="title">
-            <span>{{ subjectInfo.name }}</span>
-          </div>
-          <div style="position: absolute; bottom: 30px; right: 40%">
-            <el-button v-if="buttonShow" class="start" @click="startTest()">{{
-              buttonName
-            }}</el-button>
-          </div>
+        }"
+      >
+        <div id="title">
+          <span>{{ subjectInfo.name }}</span>
+        </div>
+        <div
+            style="
+            position: absolute;
+            bottom: 0.156rem;
+            left: 50%;
+            transform: translateX(-50%);
+          "
+        >
+          <el-button v-if="buttonShow" type="primary" class="start" @click="startTest()">
+            {{ buttonName }}
+          </el-button>
         </div>
       </div>
     </div>
@@ -80,13 +76,17 @@
     <div style="text-align: center; padding-bottom: 2rem; display: block">
       <el-button class="scaleButton" type="primary" v-if="saveFlag" @click="resultSave()">结果保存</el-button>
     </div>
+
+    <go-back />
   </div>
 </template>
 <script>
 import screenfull from "screenfull";
 import { oSessionStorage } from "../../utils/utils";
+import GoBack from "@/components/goBack/index.vue";
 
 export default {
+  components: {GoBack},
   data() {
     return {
       userId: "",

src/views/CognitiveAbilityTask/shapeIntuition2.vue

@@ -40,7 +40,7 @@
     </div>
     <div v-if="testFlag" :class="{ testMainDiv: !testState, activeTask: testState }" @contextmenu.prevent=""
       @click.left="userClick('L')" @click.right="userClick('R')">
-      <MainProgress v-if="!testTypeCode == 1" :cur-percentage="((imgIndex * 100) / 120)" />
+      <MainProgress v-if="testTypeCode == 1" :cur-percentage="(imgIndex / 120)" />
 
       <div class="taskHead">
         <div class="scale" @click.stop="screen">
@@ -52,9 +52,8 @@
         <div class="scale" @click.stop="screen">
           <img src="../../assets/small-big.png" alt="" />
         </div>
-        <el-progress class="main_progress" :stroke-width="24" :text-inside="true" :format="format"
-          :percentage="(imgIndex * 100) / 120" v-if="testTypeCode == 1" style="width:50%"></el-progress>
       </div>
+
       <div class="glass">
         <p v-show="countDownShow" class="countdownStr">
           {{ countDownStr }}
@@ -73,7 +72,7 @@
   </div>
 </template>
 <script>
-import cognitiveAbilityTaskList from "@/assets/data/cognitiveAbilityData.js";
+
 import { oSessionStorage } from "../../utils/utils";
 import { preloader } from "@/utils/utils";
 import screenfull from "screenfull";