bug修复

src/components/echarts/StackedLine.vue

@@ -14,8 +14,8 @@ export default {
       deep: true,
       handler() {
         this.drawLine();
-      },
-    },
+      }
+    }
   },
 
   methods: {
@@ -31,54 +31,53 @@ export default {
       myChart.setOption({
         color: ["#67F9D8", "#FFE434", "#56A3F1", "#FF917C"],
         title: {
-          text: "",
+          text: ""
         },
         legend: {
           data: legendData,
           orient: "vertical",
-          left: "left",
+          left: "left"
         },
         radar: [
           {
             center: ["25%", "50%"],
-            radius: 120,
+            radius: 80,
             startAngle: 2,
             splitNumber: 1,
             shape: "circle",
             axisName: {
               formatter: "【{value}】",
-              color: "#428BD4",
+              color: "#428BD4"
             },
             splitArea: {
               areaStyle: {
                 color: ["#77EADF", "#26C3BE", "#64AFE9", "#428BD4"],
                 shadowColor: "rgba(0, 0, 0, 0.2)",
-                shadowBlur: 10,
-              },
+                shadowBlur: 10
+              }
             },
             axisLine: {
               lineStyle: {
-                color: "rgba(211, 253, 250, 0.8)",
-              },
+                color: "rgba(211, 253, 250, 0.8)"
+              }
             },
             splitLine: {
               lineStyle: {
-                color: "rgba(211, 253, 250, 0.8)",
-              },
-            },
+                color: "rgba(211, 253, 250, 0.8)"
+              }
+            }
           },
           {
             indicator: _this.indicator,
-
             center: ["50%", "55%"],
-            radius: "60%",
+            radius: "30%",
             axisName: {
               color: "#fff",
               backgroundColor: "#666",
               borderRadius: 3,
-              padding: [3, 5],
-            },
-          },
+              padding: [3, 5]
+            }
+          }
         ],
         series: [
           {
@@ -91,14 +90,14 @@ export default {
                 symbol: "rect",
                 symbolSize: 12,
                 lineStyle: {
-                  type: "dashed",
+                  type: "dashed"
                 },
                 label: {
                   show: true,
                   formatter: function(params) {
                     return params.value;
-                  },
-                },
+                  }
+                }
               },
               {
                 value: _this.reference,
@@ -107,30 +106,30 @@ export default {
                   show: true,
                   formatter: function(params) {
                     return params.value;
-                  },
+                  }
                 },
                 areaStyle: {
                   color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
                     {
                       color: "rgba(255, 145, 124, 0.1)",
-                      offset: 0,
+                      offset: 0
                     },
                     {
                       color: "rgba(255, 145, 124, 0.9)",
-                      offset: 1,
-                    },
-                  ]),
-                },
-              },
-            ],
-          },
-        ],
+                      offset: 1
+                    }
+                  ])
+                }
+              }
+            ]
+          }
+        ]
       });
       window.onresize = function() {
         myChart.resize();
       };
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/components/list-item.vue

@@ -152,7 +152,7 @@ export default {
         justify-content: space-between;
 
         .left-info {
-          color: #007eff;
+          color: #8ac962;
           font-size: 11px;
         }
 

src/utils/dict.js

@@ -260,104 +260,432 @@ let cognitiveAbilityTaskList = [
   //   pageUrl:'memoryTest',
   //   testExplain:''
   // },
-    {
-      flag: '17',
-      id: '16',
-      //表示进入的测试的id号
-      taskCode:"ETBexperiment_new",
-      description: '请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些表情图片，请你想象在看到他人对你做出这种表情时，他有着什么样的情绪。请尽快和尽可能准确的作出判断，并按下相应按键。【按键为：开心、害怕、生气、厌恶、悲伤以及惊讶】。',
-      name: '人脸情绪识别任务',
-      //显示的名称
-      imageUrl: '',
-      testDescription: '请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些表情图片，请你想象在看到他人对你做出这种表情时，他有着什么样的情绪。请尽快和尽可能准确的作出判断，并按下相应按键。【按键为：开心、害怕、生气、厌恶、悲伤以及惊讶】。',
-      testNum: 0,
-      //测试人数
-      type: '1',
-      pageUrl:'',
-      testExplain:''
-    }
+  {
+    flag: "17",
+    id: "16",
+    //表示进入的测试的id号
+    taskCode: "ETBexperiment_new",
+    description:
+      "请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些表情图片，请你想象在看到他人对你做出这种表情时，他有着什么样的情绪。请尽快和尽可能准确的作出判断，并按下相应按键。【按键为：开心、害怕、生气、厌恶、悲伤以及惊讶】。",
+    name: "人脸情绪识别任务",
+    //显示的名称
+    imageUrl: "",
+    testDescription:
+      "请你注视眼前屏幕，注视点“+”过后，你将陆续看到一些表情图片，请你想象在看到他人对你做出这种表情时，他有着什么样的情绪。请尽快和尽可能准确的作出判断，并按下相应按键。【按键为：开心、害怕、生气、厌恶、悲伤以及惊讶】。",
+    testNum: 0,
+    //测试人数
+    type: "1",
+    pageUrl: "",
+    testExplain: ""
+  }
+];
 
-]
-
-//call interface 
-
-
-
-
- 
-export default cognitiveAbilityTaskList
+//call interface
 
+export default cognitiveAbilityTaskList;
 
 // 箭头列表
-const lllll = '&#8592 &#8592 &#8592 &#8592 &#8592';
-const rrrrr = '&#8594 &#8594 &#8594 &#8594 &#8594';
-const rrlrr = '&#8594 &#8594 &#8592 &#8594 &#8594';
-const llrll = '&#8592 &#8592 &#8594 &#8592 &#8592';
-const ooloo = '—      —      &#8592 —      —';
-const ooroo = '—      —      &#8594 —      —';
+const lllll = "&#8592 &#8592 &#8592 &#8592 &#8592";
+const rrrrr = "&#8594 &#8594 &#8594 &#8594 &#8594";
+const rrlrr = "&#8594 &#8594 &#8592 &#8594 &#8594";
+const llrll = "&#8592 &#8592 &#8594 &#8592 &#8592";
+const ooloo = "—      —      &#8592 —      —";
+const ooroo = "—      —      &#8594 —      —";
 const arrowList = [
-    // &#8592为向左的箭头 &#8594为向右的箭头 ，cue表示线索出现的位置，no表示没有*，up表示上方，down表示下方，
-    // center中间，double表示上下都有
-    // position表示箭头出现的位置，up表示上方，down表示下方
-    { arrow: lllll, id: 0, answer: 'L', pattern: 'lllll', cue: 'no', position: 'up' },
-    { arrow: rrrrr, id: 1, answer: 'R', pattern: 'rrrrr', cue: 'no', position: 'up' },
-    { arrow: rrlrr, id: 2, answer: 'L', pattern: 'rrlrr', cue: 'no', position: 'up' },
-    { arrow: llrll, id: 3, answer: 'R', pattern: 'llrll', cue: 'no', position: 'up' },
-    { arrow: ooloo, id: 4, answer: 'L', pattern: 'ooloo', cue: 'no', position: 'up' },
-    { arrow: ooroo, id: 5, answer: 'R', pattern: 'ooroo', cue: 'no', position: 'up' },
-
-    { arrow: lllll, id: 6, answer: 'L', pattern: 'lllll', cue: 'no', position: 'down' },
-    { arrow: rrrrr, id: 7, answer: 'R', pattern: 'rrrrr', cue: 'no', position: 'down' },
-    { arrow: rrlrr, id: 8, answer: 'L', pattern: 'rrlrr', cue: 'no', position: 'down' },
-    { arrow: llrll, id: 9, answer: 'R', pattern: 'llrll', cue: 'no', position: 'down' },
-    { arrow: ooloo, id: 10, answer: 'L', pattern: 'ooloo', cue: 'no', position: 'down' },
-    { arrow: ooroo, id: 11, answer: 'R', pattern: 'ooroo', cue: 'no', position: 'down' },
-
-    { arrow: lllll, id: 12, answer: 'L', pattern: 'lllll', cue: 'center', position: 'up' },
-    { arrow: rrrrr, id: 13, answer: 'R', pattern: 'rrrrr', cue: 'center', position: 'up' },
-    { arrow: rrlrr, id: 14, answer: 'L', pattern: 'rrlrr', cue: 'center', position: 'up' },
-    { arrow: llrll, id: 15, answer: 'R', pattern: 'llrll', cue: 'center', position: 'up' },
-    { arrow: ooloo, id: 16, answer: 'L', pattern: 'ooloo', cue: 'center', position: 'up' },
-    { arrow: ooroo, id: 17, answer: 'R', pattern: 'ooroo', cue: 'center', position: 'up' },
-
-    { arrow: lllll, id: 18, answer: 'L', pattern: 'lllll', cue: 'center', position: 'down' },
-    { arrow: rrrrr, id: 19, answer: 'R', pattern: 'rrrrr', cue: 'center', position: 'down' },
-    { arrow: rrlrr, id: 20, answer: 'L', pattern: 'rrlrr', cue: 'center', position: 'down' },
-    { arrow: llrll, id: 21, answer: 'R', pattern: 'llrll', cue: 'center', position: 'down' },
-    { arrow: ooloo, id: 22, answer: 'L', pattern: 'ooloo', cue: 'center', position: 'down' },
-    { arrow: ooroo, id: 23, answer: 'R', pattern: 'ooroo', cue: 'center', position: 'down' },
-
-    { arrow: lllll, id: 24, answer: 'L', pattern: 'lllll', cue: 'double', position: 'up' },
-    { arrow: rrrrr, id: 25, answer: 'R', pattern: 'rrrrr', cue: 'double', position: 'up' },
-    { arrow: rrlrr, id: 26, answer: 'L', pattern: 'rrlrr', cue: 'double', position: 'up' },
-    { arrow: llrll, id: 27, answer: 'R', pattern: 'llrll', cue: 'double', position: 'up' },
-    { arrow: ooloo, id: 28, answer: 'L', pattern: 'ooloo', cue: 'double', position: 'up' },
-    { arrow: ooroo, id: 29, answer: 'R', pattern: 'ooroo', cue: 'double', position: 'up' },
+  // &#8592为向左的箭头 &#8594为向右的箭头 ，cue表示线索出现的位置，no表示没有*，up表示上方，down表示下方，
+  // center中间，double表示上下都有
+  // position表示箭头出现的位置，up表示上方，down表示下方
+  {
+    arrow: lllll,
+    id: 0,
+    answer: "L",
+    pattern: "lllll",
+    cue: "no",
+    position: "up"
+  },
+  {
+    arrow: rrrrr,
+    id: 1,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "no",
+    position: "up"
+  },
+  {
+    arrow: rrlrr,
+    id: 2,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "no",
+    position: "up"
+  },
+  {
+    arrow: llrll,
+    id: 3,
+    answer: "R",
+    pattern: "llrll",
+    cue: "no",
+    position: "up"
+  },
+  {
+    arrow: ooloo,
+    id: 4,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "no",
+    position: "up"
+  },
+  {
+    arrow: ooroo,
+    id: 5,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "no",
+    position: "up"
+  },
 
-    { arrow: lllll, id: 30, answer: 'L', pattern: 'lllll', cue: 'double', position: 'down' },
-    { arrow: rrrrr, id: 31, answer: 'R', pattern: 'rrrrr', cue: 'double', position: 'down' },
-    { arrow: rrlrr, id: 32, answer: 'L', pattern: 'rrlrr', cue: 'double', position: 'down' },
-    { arrow: llrll, id: 33, answer: 'R', pattern: 'llrll', cue: 'double', position: 'down' },
-    { arrow: ooloo, id: 34, answer: 'L', pattern: 'ooloo', cue: 'double', position: 'down' },
-    { arrow: ooroo, id: 35, answer: 'R', pattern: 'ooroo', cue: 'double', position: 'down' },
+  {
+    arrow: lllll,
+    id: 6,
+    answer: "L",
+    pattern: "lllll",
+    cue: "no",
+    position: "down"
+  },
+  {
+    arrow: rrrrr,
+    id: 7,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "no",
+    position: "down"
+  },
+  {
+    arrow: rrlrr,
+    id: 8,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "no",
+    position: "down"
+  },
+  {
+    arrow: llrll,
+    id: 9,
+    answer: "R",
+    pattern: "llrll",
+    cue: "no",
+    position: "down"
+  },
+  {
+    arrow: ooloo,
+    id: 10,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "no",
+    position: "down"
+  },
+  {
+    arrow: ooroo,
+    id: 11,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "no",
+    position: "down"
+  },
 
-    { arrow: lllll, id: 36, answer: 'L', pattern: 'lllll', cue: 'up', position: 'up' },
-    { arrow: rrrrr, id: 37, answer: 'R', pattern: 'rrrrr', cue: 'up', position: 'up' },
-    { arrow: rrlrr, id: 38, answer: 'L', pattern: 'rrlrr', cue: 'up', position: 'up' },
-    { arrow: llrll, id: 39, answer: 'R', pattern: 'llrll', cue: 'up', position: 'up' },
-    { arrow: ooloo, id: 40, answer: 'L', pattern: 'ooloo', cue: 'up', position: 'up' },
-    { arrow: ooroo, id: 41, answer: 'R', pattern: 'ooroo', cue: 'up', position: 'up' },
+  {
+    arrow: lllll,
+    id: 12,
+    answer: "L",
+    pattern: "lllll",
+    cue: "center",
+    position: "up"
+  },
+  {
+    arrow: rrrrr,
+    id: 13,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "center",
+    position: "up"
+  },
+  {
+    arrow: rrlrr,
+    id: 14,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "center",
+    position: "up"
+  },
+  {
+    arrow: llrll,
+    id: 15,
+    answer: "R",
+    pattern: "llrll",
+    cue: "center",
+    position: "up"
+  },
+  {
+    arrow: ooloo,
+    id: 16,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "center",
+    position: "up"
+  },
+  {
+    arrow: ooroo,
+    id: 17,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "center",
+    position: "up"
+  },
 
-    { arrow: lllll, id: 42, answer: 'L', pattern: 'lllll', cue: 'down', position: 'down' },
-    { arrow: rrrrr, id: 43, answer: 'R', pattern: 'rrrrr', cue: 'down', position: 'down' },
-    { arrow: rrlrr, id: 44, answer: 'L', pattern: 'rrlrr', cue: 'down', position: 'down' },
-    { arrow: llrll, id: 45, answer: 'R', pattern: 'llrll', cue: 'down', position: 'down' },
-    { arrow: ooloo, id: 46, answer: 'L', pattern: 'ooloo', cue: 'down', position: 'down' },
-    { arrow: ooroo, id: 47, answer: 'R', pattern: 'ooroo', cue: 'down', position: 'down' },
-]
+  {
+    arrow: lllll,
+    id: 18,
+    answer: "L",
+    pattern: "lllll",
+    cue: "center",
+    position: "down"
+  },
+  {
+    arrow: rrrrr,
+    id: 19,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "center",
+    position: "down"
+  },
+  {
+    arrow: rrlrr,
+    id: 20,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "center",
+    position: "down"
+  },
+  {
+    arrow: llrll,
+    id: 21,
+    answer: "R",
+    pattern: "llrll",
+    cue: "center",
+    position: "down"
+  },
+  {
+    arrow: ooloo,
+    id: 22,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "center",
+    position: "down"
+  },
+  {
+    arrow: ooroo,
+    id: 23,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "center",
+    position: "down"
+  },
 
+  {
+    arrow: lllll,
+    id: 24,
+    answer: "L",
+    pattern: "lllll",
+    cue: "double",
+    position: "up"
+  },
+  {
+    arrow: rrrrr,
+    id: 25,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "double",
+    position: "up"
+  },
+  {
+    arrow: rrlrr,
+    id: 26,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "double",
+    position: "up"
+  },
+  {
+    arrow: llrll,
+    id: 27,
+    answer: "R",
+    pattern: "llrll",
+    cue: "double",
+    position: "up"
+  },
+  {
+    arrow: ooloo,
+    id: 28,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "double",
+    position: "up"
+  },
+  {
+    arrow: ooroo,
+    id: 29,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "double",
+    position: "up"
+  },
 
+  {
+    arrow: lllll,
+    id: 30,
+    answer: "L",
+    pattern: "lllll",
+    cue: "double",
+    position: "down"
+  },
+  {
+    arrow: rrrrr,
+    id: 31,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "double",
+    position: "down"
+  },
+  {
+    arrow: rrlrr,
+    id: 32,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "double",
+    position: "down"
+  },
+  {
+    arrow: llrll,
+    id: 33,
+    answer: "R",
+    pattern: "llrll",
+    cue: "double",
+    position: "down"
+  },
+  {
+    arrow: ooloo,
+    id: 34,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "double",
+    position: "down"
+  },
+  {
+    arrow: ooroo,
+    id: 35,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "double",
+    position: "down"
+  },
 
+  {
+    arrow: lllll,
+    id: 36,
+    answer: "L",
+    pattern: "lllll",
+    cue: "up",
+    position: "up"
+  },
+  {
+    arrow: rrrrr,
+    id: 37,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "up",
+    position: "up"
+  },
+  {
+    arrow: rrlrr,
+    id: 38,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "up",
+    position: "up"
+  },
+  {
+    arrow: llrll,
+    id: 39,
+    answer: "R",
+    pattern: "llrll",
+    cue: "up",
+    position: "up"
+  },
+  {
+    arrow: ooloo,
+    id: 40,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "up",
+    position: "up"
+  },
+  {
+    arrow: ooroo,
+    id: 41,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "up",
+    position: "up"
+  },
 
+  {
+    arrow: lllll,
+    id: 42,
+    answer: "L",
+    pattern: "lllll",
+    cue: "down",
+    position: "down"
+  },
+  {
+    arrow: rrrrr,
+    id: 43,
+    answer: "R",
+    pattern: "rrrrr",
+    cue: "down",
+    position: "down"
+  },
+  {
+    arrow: rrlrr,
+    id: 44,
+    answer: "L",
+    pattern: "rrlrr",
+    cue: "down",
+    position: "down"
+  },
+  {
+    arrow: llrll,
+    id: 45,
+    answer: "R",
+    pattern: "llrll",
+    cue: "down",
+    position: "down"
+  },
+  {
+    arrow: ooloo,
+    id: 46,
+    answer: "L",
+    pattern: "ooloo",
+    cue: "down",
+    position: "down"
+  },
+  {
+    arrow: ooroo,
+    id: 47,
+    answer: "R",
+    pattern: "ooroo",
+    cue: "down",
+    position: "down"
+  }
+];
 
-export { cognitiveAbilityTaskList, arrowList }
+export { cognitiveAbilityTaskList, arrowList };

src/views/cognitiveTask/ECAT.vue

@@ -795,7 +795,7 @@ export default {
         .alert({
           title: "提示",
           message:
-            "词汇分类任务结束，接下来进行词汇回忆测试，您有十秒钟的休息时间。请按确定按钮继续。"
+            "词汇分类任务结束，接下来进行词汇回忆测试，您有十秒钟的休息时间。请按确认按钮继续。"
         })
         .then(() => {
           // on close

src/views/cognitiveTask/ECATAddiction.vue

@@ -718,7 +718,7 @@ export default {
       this.$store.dispatch("setVocabularyClassify", result);
 
       this.$alert(
-        "词汇分类任务结束，接下来进行词汇回忆测试，请按确定按钮继续。",
+        "词汇分类任务结束，接下来进行词汇回忆测试，请按确认按钮继续。",
         "提示",
         {
           confirmButtonText: "确定",

src/views/cognitiveTask/movementPerception.vue

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

src/views/cognitiveTask/movementPerceptionChild.vue

@@ -17,8 +17,8 @@
           round
           type="primary"
           @click="startTest()"
-          >{{ buttonName }}
-        </van-button>
+          >{{ buttonName }}</van-button
+        >
       </div>
     </div>
 
@@ -844,6 +844,5 @@ export default {
 
 .btn-content .btn-item /deep/ .van-button {
   margin: 30px 0;
-  color: #2c3e50;
 }
 </style>

src/views/cognitiveTask/prospectiveMemoryAbility.vue

@@ -521,89 +521,89 @@ export default {
         }
       ],
       name1: [
-        { flagid: 3, idiomName: "王者荣耀" },
-        { flagid: 3, idiomName: "淘宝商家" },
-        { flagid: 3, idiomName: "英雄联盟" },
-        { flagid: 3, idiomName: "兰州拉面" },
-        { flagid: 3, idiomName: "釜山料理" },
-        { flagid: 3, idiomName: "建筑工人" },
-        { flagid: 3, idiomName: "警察叔叔" },
-        { flagid: 3, idiomName: "记忆检查" },
-        { flagid: 3, idiomName: "抽样调查" },
-        { flagid: 3, idiomName: "出门旅行" },
-        { flagid: 3, idiomName: "清扫房间" },
-        { flagid: 3, idiomName: "翻看笔记" },
-        { flagid: 3, idiomName: "准备考试" },
-        { flagid: 3, idiomName: "外面下雨" },
-        { flagid: 3, idiomName: "出门运动" },
-        { flagid: 3, idiomName: "点个外卖" },
-        { flagid: 3, idiomName: "颜色填充" },
-        { flagid: 3, idiomName: "邮件发送" },
-        { flagid: 3, idiomName: "买一瓶水" },
-        { flagid: 3, idiomName: "同事聚餐" },
+        { flagid: 3, idiomName: "笔记本" },
+        { flagid: 3, idiomName: "越野车" },
+        { flagid: 3, idiomName: "显示器" },
+        { flagid: 3, idiomName: "一望无际" },
+        { flagid: 3, idiomName: "一触即发" },
+        { flagid: 3, idiomName: "半信半疑" },
+        { flagid: 3, idiomName: "空气污染" },
+        { flagid: 3, idiomName: "反复无常" },
+        { flagid: 3, idiomName: "拂袖而去" },
+        { flagid: 3, idiomName: "飞黄腾达" },
+        { flagid: 3, idiomName: "风花雪月" },
+        { flagid: 3, idiomName: "冠冕堂皇" },
+        { flagid: 3, idiomName: "宾至如归" },
+        { flagid: 3, idiomName: "会议室" },
+        { flagid: 3, idiomName: "人工智能" },
+        { flagid: 3, idiomName: "芯片封装" },
+        { flagid: 3, idiomName: "门诊楼" },
+        { flagid: 3, idiomName: "贸易战" },
+        { flagid: 3, idiomName: "环境保护" },
+        { flagid: 3, idiomName: "摩天大楼" },
 
-        { flagid: 2, idiomName: "山清水秀" },
-        { flagid: 2, idiomName: "春暖花开" },
-        { flagid: 2, idiomName: "张灯结彩" },
-        { flagid: 2, idiomName: "十全十美" },
-        { flagid: 2, idiomName: "三心二意" },
-        { flagid: 2, idiomName: "诗情画意" },
-        { flagid: 2, idiomName: "美中不足" },
-        { flagid: 2, idiomName: "水深火热" },
-        { flagid: 2, idiomName: "先入为主" },
-        { flagid: 2, idiomName: "面红耳赤" },
-        { flagid: 2, idiomName: "你追我赶" },
-        { flagid: 2, idiomName: "古今中外" },
-        { flagid: 2, idiomName: "南来北往" },
-        { flagid: 2, idiomName: "念念不忘" },
-        { flagid: 2, idiomName: "别有洞天" },
-        { flagid: 2, idiomName: "百花齐放" },
-        { flagid: 2, idiomName: "答非所问" },
-        { flagid: 2, idiomName: "拔苗助长" },
-        { flagid: 2, idiomName: "瓜田李下" },
-        { flagid: 2, idiomName: "坐井观天" },
+        { flagid: 2, idiomName: "战斗机" },
+        { flagid: 2, idiomName: "目标锁定" },
+        { flagid: 2, idiomName: "空地导弹" },
+        { flagid: 2, idiomName: "空空导弹" },
+        { flagid: 2, idiomName: "对地打击" },
+        { flagid: 2, idiomName: "对空防御" },
+        { flagid: 2, idiomName: "空速校准" },
+        { flagid: 2, idiomName: "失速警告" },
+        { flagid: 2, idiomName: "空地通信" },
+        { flagid: 2, idiomName: "敌我识别" },
+        { flagid: 2, idiomName: "紧急迫降" },
+        { flagid: 2, idiomName: "作战半径" },
+        { flagid: 2, idiomName: "电子对抗" },
+        { flagid: 2, idiomName: "滑跑方向" },
+        { flagid: 2, idiomName: "航迹偏差" },
+        { flagid: 2, idiomName: "滚转" },
+        { flagid: 2, idiomName: "抬轮" },
+        { flagid: 2, idiomName: "航迹角" },
+        { flagid: 2, idiomName: "地面效应" },
+        { flagid: 2, idiomName: "起落架" },
 
-        { flagid: 1, idiomName: "小羊吃草" },
-        { flagid: 1, idiomName: "猫吃老鼠" },
-        { flagid: 1, idiomName: "蟑螂恶霸" },
-        { flagid: 1, idiomName: "蜻蜓在飞" },
-        { flagid: 1, idiomName: "两只蝴蝶" },
-        { flagid: 1, idiomName: "老虎吃肉" },
-        { flagid: 1, idiomName: "斗牛勇士" },
-        { flagid: 1, idiomName: "打虎英雄" },
-        { flagid: 1, idiomName: "老人与狗" },
-        { flagid: 1, idiomName: "牧民放羊" },
-        { flagid: 1, idiomName: "小狗可爱" },
-        { flagid: 1, idiomName: "狐狸狡猾" },
-        { flagid: 1, idiomName: "温柔小羊" },
-        { flagid: 1, idiomName: "牛肉拉面" },
-        { flagid: 1, idiomName: "澳洲牛排" },
-        { flagid: 1, idiomName: "羊肉火锅" },
-        { flagid: 1, idiomName: "小鱼游动" },
-        { flagid: 1, idiomName: "海豚表演" },
-        { flagid: 1, idiomName: "海狮顶球" },
-        { flagid: 1, idiomName: "清晨鸟叫" },
+        { flagid: 1, idiomName: "飞行高度" },
+        { flagid: 1, idiomName: "升降舵" },
+        { flagid: 1, idiomName: "高度计" },
+        { flagid: 1, idiomName: "指南针" },
+        { flagid: 1, idiomName: "紧急下降" },
+        { flagid: 1, idiomName: "下降气流" },
+        { flagid: 1, idiomName: "上升气流" },
+        { flagid: 1, idiomName: "低空飞行" },
+        { flagid: 1, idiomName: "高度保持" },
+        { flagid: 1, idiomName: "标高" },
+        { flagid: 1, idiomName: "东向航线" },
+        { flagid: 1, idiomName: "东磁航向" },
+        { flagid: 1, idiomName: "西方飞行" },
+        { flagid: 1, idiomName: "北向气流" },
+        { flagid: 1, idiomName: "南风面" },
+        { flagid: 1, idiomName: "中央航路" },
+        { flagid: 1, idiomName: "推力反推" },
+        { flagid: 1, idiomName: "进近" },
+        { flagid: 1, idiomName: "下降方向" },
+        { flagid: 1, idiomName: "低空飞行" },
 
-        { flagid: 1, idiomName: "走马观花" },
-        { flagid: 1, idiomName: "一马当先" },
-        { flagid: 1, idiomName: "龙马精神" },
-        { flagid: 1, idiomName: "煮鹤烧琴" },
-        { flagid: 1, idiomName: "蜻蜓点水" },
-        { flagid: 1, idiomName: "蜂虿有毒" },
-        { flagid: 1, idiomName: "呼牛呼马" },
-        { flagid: 1, idiomName: "放虎归山" },
-        { flagid: 1, idiomName: "鹰觑鹘望" },
-        { flagid: 1, idiomName: "犬马之劳" },
-        { flagid: 1, idiomName: "溜须拍马" },
-        { flagid: 1, idiomName: "狼心狗肺" },
-        { flagid: 1, idiomName: "土龙刍狗" },
-        { flagid: 1, idiomName: "鱼龙曼延" },
-        { flagid: 1, idiomName: "为渊驱鱼" },
-        { flagid: 1, idiomName: "狐裘羔袖" },
-        { flagid: 1, idiomName: "独占鳌头" },
-        { flagid: 1, idiomName: "龙蛇混杂" },
-        { flagid: 1, idiomName: "五马分尸" },
-        { flagid: 1, idiomName: "鱼目混珠" }
+        { flagid: 1, idiomName: "南来北往" },
+        { flagid: 1, idiomName: "无问东西" },
+        { flagid: 1, idiomName: "七上八下" },
+        { flagid: 1, idiomName: "下楼" },
+        { flagid: 1, idiomName: "高山流水" },
+        { flagid: 1, idiomName: "北极圈" },
+        { flagid: 1, idiomName: "日薄西山" },
+        { flagid: 1, idiomName: "中流砥柱" },
+        { flagid: 1, idiomName: "东窗事发" },
+        { flagid: 1, idiomName: "北斗星" },
+        { flagid: 1, idiomName: "南辕北辙" },
+        { flagid: 1, idiomName: "南腔北调" },
+        { flagid: 1, idiomName: "西装革履" },
+        { flagid: 1, idiomName: "自上而下" },
+        { flagid: 1, idiomName: "下不为例" },
+        { flagid: 1, idiomName: "东施效颦" },
+        { flagid: 1, idiomName: "东山再起" },
+        { flagid: 1, idiomName: "西北坡" },
+        { flagid: 1, idiomName: "西部开发" },
+        { flagid: 1, idiomName: "南京市" }
 
         //
         //

src/views/cognitiveTask/shapeIntuition2.vue

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

src/views/user/cognitiveTaskOldTestRecord.vue

@@ -9,7 +9,7 @@
             测试者：<span>{{ getUserInfo.petName }}</span>
           </div>
           <div class="line-test-name">
-            {{ type == "0" ? "量表名称" : type == "1" ? "任务名称" : "其它" }}：
+            <!--            {{ type == "0" ? "量表名称" : type == "1" ? "任务名称" : "其它" }}：-->
             <span>{{ tableName }}</span>
           </div>
           <div class="line-test-time">
@@ -50,7 +50,7 @@
 
         <div class="btnArea">
           <van-button round size="small" type="primary" @click="download"
-            >下载测试结果
+            >点击下载
           </van-button>
         </div>
       </div>
@@ -209,7 +209,7 @@ export default {
 
     .line-name {
       font-size: 20px;
-      color: #007eff;
+      color: #8ac962;
       padding-left: 20px;
       margin-top: 40px;
     }
@@ -237,7 +237,7 @@ export default {
     .table-th {
       height: 32px;
       font-size: 14px;
-      background: #007eff;
+      background: #8ac962;
       color: #fff;
 
       th {

src/views/user/login.vue

@@ -144,7 +144,7 @@ export default {
       }
 
       if (!this.phone) {
-        this.$toast("请输入身份证号");
+        this.$toast("请输入账号");
         return;
       }