周玉佂 3 месяцев назад
Родитель
Сommit
511e7ec11f

+ 6 - 1
src/components/tableList/index.vue

@@ -6,6 +6,11 @@
       v-for="(item, i) in dataList"
       :key="i"
     >
+      <tr v-if="flagA === 'ProspectiveMemory'">
+        <th v-for="(names, index) in dataList" :key="index">
+          得分 {{ names }}
+        </th>
+      </tr>
       <tr>
         <th v-for="(names, index) in item.colNames" :key="index">
           {{ names }}
@@ -24,7 +29,7 @@
 <script>
 export default {
   name: "tableList",
-  props: ["dataList"],
+  props: ["dataList",'flagA'],
 };
 </script>
 <style lang="scss" scoped>

+ 8 - 3
src/views/CognitiveAbilityTask/memoryTest.vue

@@ -540,7 +540,6 @@ export default {
         this.back1Flag = false;
         this.back2Flag = true;
       }
-
       this.userCanClick = false;
       this.countDownShow = true;
       this.getArray();
@@ -577,10 +576,14 @@ export default {
             Obj.index = this.imgIndex - 2;
             Obj.diff = 0;
           } else if (this.testTypeCode == 1) {
-            Obj.index = this.imgIndex + 20 - 2 - 1;
+            Obj.index = this.imgIndex - 2;
+            console.log(this.imgIndex)
+            // Obj.index = this.imgIndex + 20 - 2 - 1;
             Obj.diff = 1;
           } else if (this.testTypeCode == 2) {
-            Obj.index = this.imgIndex + 40 - 1 - 4;
+            Obj.index = this.imgIndex + 20 - 2 - 1;
+            console.log(this.imgIndex)
+            // Obj.index = this.imgIndex + 40 - 1 - 4;
             Obj.diff = 2;
           }
           this.userResponseRecords.push(Obj);
@@ -697,6 +700,8 @@ export default {
           this.code0Flag = false;
           this.code12Flag = true;
           this.buttonShow = true;
+          this.userTestPicList = [];
+          this.userResponseRecords=[]
           this.screenState();
           this.$message({
             message: "测试通过!",

+ 6 - 5
src/views/PersionDetail.vue

@@ -39,11 +39,12 @@
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;如结果与你自己或他人感知的有出入,可回忆在测试时是否有事情影响了你,或自己答题时是否有所顾虑;<br>
           </div>
           <result-title class="result-div" text="分值"/>
-          <div v-if="ProspectiveMemory.flag === 'ProspectiveMemory'" class="table-list">
-            <span v-for="it in resResult" :key="it" class="table-list-span" >{{it}}</span>
-          </div>
-          <div v-else class="table-list">
-            <table-list :dataList="resResult" />
+<!--          {{resResult}}-->
+<!--          <div v-if="ProspectiveMemory.flag === 'ProspectiveMemory'" class="table-list">-->
+<!--            <span v-for="it in resResult" :key="it" class="table-list-span" >{{it}}</span>-->
+<!--          </div>-->
+          <div  class="table-list">
+            <table-list :dataList="resResult" :flagA="ProspectiveMemory.flag" />
           </div>
           <div v-if="tableName === '记忆检查测试'" style="margin-top: 30px">
             <div