zhangzhang 3 hónapja
szülő
commit
c02a128ce7

+ 6 - 3
src/components/echarts/StackedLine.vue

@@ -67,15 +67,17 @@ export default {
               }
             }
           },
+
           {
             indicator: _this.indicator,
             center: ["50%", "55%"],
             radius: "50%",
             axisName: {
-              color: "#fff",
-              backgroundColor: "#666",
+              color: "#999",
+              fontWeight: "bold",
+              backgroundColor: "#f9f9f9",
               borderRadius: 3,
-              padding: [3, 5],
+              padding: [10, 5],
               formatter: function(value) {
                 // 将文本拆分成数组,每5个字一组
                 let words = value.split("");
@@ -106,6 +108,7 @@ export default {
                 name: "你的分数",
                 symbol: "rect",
                 symbolSize: 12,
+
                 lineStyle: {
                   type: "dashed"
                 },

+ 14 - 1
src/views/cognitiveTask/goNogoTask.vue

@@ -60,6 +60,8 @@
             :style="{ background: backgroundColor }"
             class="goNoGoTask txt-center"
           ></div>
+          <!--            十字架-->
+          <div v-if="!divShow && !countDownSpanShow" class="cross"></div>
         </div>
       </div>
       <div v-if="saveFlag" class="t6" @click="resultSave()">
@@ -414,6 +416,7 @@ export default {
           default:
             break;
         }
+
         setTimeout(() => {
           this.divShow = false;
         }, 500);
@@ -521,7 +524,17 @@ export default {
   border-radius: 28px;
   /* object-fit:fill; */
 }
-
+.cross {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 50px;
+  height: 50px;
+  background: url(../../assets/congnitiveAblitity/whiteFlag-new.png) no-repeat
+    center;
+  background-size: cover;
+}
 .countdownStr {
   position: absolute;
   top: 50%;

+ 1 - 1
src/views/cognitiveTask/movementPerception.vue

@@ -139,7 +139,7 @@
                   block
                   round
                   size="small"
-                  type="primary"
+                  type="info"
                   @click="userClick(37)"
                 >
                   <van-icon name="arrow-left" />

+ 13 - 4
src/views/cognitiveTask/shapeIntuition.vue

@@ -77,7 +77,7 @@
                   block
                   round
                   size="small"
-                  type="info"
+                  :type="leftButton"
                   @click="userClick('L')"
                 >
                   <van-icon name="arrow-left" />
@@ -88,7 +88,7 @@
                   block
                   round
                   size="small"
-                  type="info"
+                  :type="rightButton"
                   @click="userClick('R')"
                 >
                   <van-icon name="arrow" />
@@ -147,7 +147,9 @@ export default {
       startMilliSeconds: 0, //反应时
       userResponseRecords: [], //用户测试反应记录
       saveFalg: true,
-      testPlanId: ""
+      testPlanId: "",
+      leftButton: "info", //默认按钮样式
+      rightButton: "info"
     };
   },
   // 页面初始化函数
@@ -180,9 +182,16 @@ export default {
         return;
       }
       if (this.testTypeCode == 0 && this.userRightClickDirection != clickFlag) {
-        this.$toast.fail("点击错误,请根据图中提示,点击鼠标");
+        if (clickFlag == "L") {
+          this.rightButton = "primary";
+        } else if (clickFlag == "R") {
+          this.leftButton = "primary";
+        }
+        this.$toast.fail("点击错误,请根据按钮颜色提示进行点击");
         return;
       }
+      this.rightButton = "info";
+      this.leftButton = "info";
       this.showDuckEgg = false;
       this.showWhiteFlag = true;
       let milliSecondsCount = new Date().getTime() - this.startMilliSeconds;

+ 1 - 1
src/views/cognitiveTask/shapeIntuition2.vue

@@ -132,7 +132,7 @@
                 block
                 round
                 size="small"
-                type="primary"
+                type="info"
                 @click="userClick('L')"
               >
                 <van-icon name="arrow-left" />