bug修复

public/config/global.js

@@ -5,18 +5,18 @@
 // }
 
 const env = {
-    // dev: 'http://cognitive.wistcm.com:8090/',
-    // dev: 'http://192.168.0.18:8098/',
-    // dev: 'http://192.168.1.11:8098/',
-    // dev: 'http://192.168.1.4:8098/',
-    // dev: 'http://192.168.1.11:8098/',
-    dev: 'http://192.168.1.3:8105/',
-    // dev: 'http://172.20.10.2:8098/',
-    // dev: 'http://172.20.10.4:8098/',
-    prod: 'http://cognitive.wistcm.com:8090/',
-    scoketUrl: "ws://cognitive.wistcm.com:8090/websocket/",
-    photoUrl: "https://test.jue-ming.com:8849/api/show?filePath="
-}
+  // dev: 'http://cognitive.wistcm.com:8090/',
+  // dev: 'http://192.168.0.18:8098/',
+  // dev: 'http://192.168.1.11:8098/',
+  // dev: 'http://192.168.1.4:8098/',
+  // dev: 'http://192.168.1.11:8098/',
+  dev: "http://192.168.1.6:8105/",
+  // dev: 'http://172.20.10.2:8098/',
+  // dev: 'http://172.20.10.4:8098/',
+  prod: "http://cognitive.wistcm.com:8090/",
+  scoketUrl: "ws://cognitive.wistcm.com:8090/websocket/",
+  photoUrl: "https://test.jue-ming.com:8849/api/show?filePath="
+};
 
 //26环境
 // var env = {

src/views/user/cognitiveTaskOldTestRecord.vue

@@ -17,7 +17,12 @@
           </div>
         </div>
         <PageModule text="分值">
-          <table class="inner-table">
+          <table
+            class="inner-table"
+            v-if="
+              tableName !== '综合记忆能力测试' && tableName !== 'Stroop任务'
+            "
+          >
             <tr class="table-th">
               <th>项目</th>
               <th>内容</th>
@@ -33,6 +38,44 @@
               <td class="td-result">{{ item.score }}</td>
             </tr>
           </table>
+
+          <table class="inner-table" v-if="tableName == '综合记忆能力测试'">
+            <tr class="table-th">
+              <th>项目</th>
+              <th>即时记忆</th>
+              <th>延时记忆</th>
+            </tr>
+            <!--            {{-->
+            <!--              resResult-->
+            <!--            }}-->
+            <tr v-for="(item, index) in resResult" :key="index">
+              <!--              {{-->
+              <!--                resResult-->
+              <!--              }}-->
+              <td class="td-result2">{{ item.name }}</td>
+              <td class="td-result2">{{ item.score }}</td>
+              <td class="td-result2">{{ item.score2 }}</td>
+            </tr>
+          </table>
+
+          <table class="inner-table" v-if="tableName == 'Stroop任务'">
+            <tr class="table-th">
+              <th>项目</th>
+              <th>平均用时</th>
+              <th>平均正确率</th>
+            </tr>
+            <!--            {{-->
+            <!--              resResult-->
+            <!--            }}-->
+            <tr v-for="(item, index) in resResult" :key="index">
+              <!--              {{-->
+              <!--                resResult-->
+              <!--              }}-->
+              <td class="td-result2">{{ item.name }}</td>
+              <td class="td-result2">{{ item.score }}</td>
+              <td class="td-result2">{{ item.score2 }}</td>
+            </tr>
+          </table>
         </PageModule>
 
         <div class="report-tip">
@@ -72,7 +115,6 @@ export default {
       name: "",
       tableName: "",
       time: "",
-
       baseUrl: baseUrl,
       resResult: [],
       userType: "", //用户类
@@ -99,12 +141,13 @@ export default {
   },
   methods: {
     getDataList(v) {
-      // console.log("vvvvv", v);
+      console.log("vvvvv", v);
       v.forEach(item => {
         if (item && item.value[0] && item.value[0] != "") {
           this.resResult.push({
             name: item.name,
-            score: item.value[0]
+            score: item.value[0],
+            score2: item.value[1]
           });
         }
       });
@@ -257,6 +300,17 @@ export default {
       border-right: 1px solid white;
       text-align: center;
     }
+    .td-result2 {
+      height: 14px;
+      min-height: 32px;
+      padding: 7px;
+      font-size: 14px;
+      width: 33%;
+      background-color: #f0f3f6;
+      border-bottom: 1px solid white;
+      border-right: 1px solid white;
+      text-align: center;
+    }
   }
 
   .report-tip {