修改测试计划--计划对比的个人报告列表对比分析

src/components/ComparePlanUser.vue

@@ -138,21 +138,21 @@
           <div class="compare_score">
             <div class="compare_score_inner">
               <div class="compare_score_left" v-if="userData1.length > 0">
-                总分：{{ userData1[userData1.length - 1].dimensionScore }}
+                总分：{{ userData1[0].dimensionScore }}
               </div>
               <div class="compare_result" v-if="userData1.length > 0">
-                结论：{{ userData1[userData1.length - 1].dimensionSymptom }}、{{
-                  userData1[userData1.length - 1].dimensionImprovement
+                结论：{{ userData1[0].dimensionSymptom }}、{{
+                  userData1[0].dimensionImprovement
                 }}
               </div>
             </div>
             <div class="compare_score_inner">
               <div class="compare_score_right" v-if="userData2.length > 0">
-                总分：{{ userData2[userData2.length - 1].dimensionScore }}
+                总分：{{ userData2[0].dimensionScore }}
               </div>
               <div class="compare_result" v-if="userData2.length > 0">
-                结论：{{ userData2[userData2.length - 1].dimensionSymptom }}、{{
-                  userData2[userData2.length - 1].dimensionImprovement
+                结论：{{ userData2[0].dimensionSymptom }}、{{
+                  userData2[0].dimensionImprovement
                 }}
               </div>
             </div>
@@ -161,7 +161,7 @@
           <div ref="echarts_zhu" style="width: 100%; height: 600px"></div>
           <div class="cpmpare_all" v-if="userData1.length > 0 && userData2.length > 0">
             <div v-for="(item, index) in userData1" :key="item.id">
-              <div v-show="index < userData2.length - 1">
+              <div v-show="item.dimensionName != '总分'">
                 <div class="dimensionality_out">
                   <div class="left">
                     <span class="totol_all">维度：</span
@@ -178,7 +178,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -192,7 +192,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -207,7 +207,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -220,7 +220,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -235,7 +235,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -248,7 +248,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -492,6 +492,9 @@ export default {
       xAxis: {
         type: "category",
         data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+        axisLabel:{
+          interval:0
+        }
       },
       yAxis: {
         type: "value",
@@ -544,9 +547,7 @@ export default {
         console.log(res);
         if (res && res.code == 200) {
           this.orgName1 = res.data.user.orgName;
-          let a = res.data.report.filter((item) => {
-            return item.isIcon == "1";
-          });
+          let a = res.data.report;
 
           this.userData1 = a;
           if (this.userData2.length == 0) {
@@ -587,14 +588,16 @@ export default {
       let scoreDes = [];
       let nameList = [];
       let zhuNameList = [];
-      for (let i = 0; i < a.length - 1; i++) {
+      for (let i = 0; i < a.length; i++) {
         //
-        scoreList.push(parseInt(a[i].dimensionScore));
-        scoreDes.push(a[i].dimensionAnalysis);
+        if (a[i].dimensionName != "总分") {
+          scoreList.push(parseInt(a[i].dimensionScore));
+          scoreDes.push(a[i].dimensionAnalysis);
 
-        let ob = { name: a[i].dimensionName, max: 100 };
-        nameList.push(ob);
-        zhuNameList.push(a[i].dimensionName);
+          let ob = { name: a[i].dimensionName, max: 100 };
+          nameList.push(ob);
+          zhuNameList.push(a[i].dimensionName);
+        }
       }
       this.echarts_zhuname_list = zhuNameList;
       if (index == "1") {

src/components/CompareUser.vue

@@ -125,21 +125,21 @@
           <div class="compare_score">
             <div class="compare_score_inner">
               <div class="compare_score_left" v-if="userData1.length > 0">
-                总分：{{ userData1[userData1.length - 1].dimensionScore }}
+                总分：{{ userData1[0].dimensionScore }}
               </div>
               <div class="compare_result" v-if="userData1.length > 0">
-                结论：{{ userData1[userData1.length - 1].dimensionSymptom }}、{{
-                  userData1[userData1.length - 1].dimensionImprovement
+                结论：{{ userData1[0].dimensionSymptom }}、{{
+                  userData1[0].dimensionImprovement
                 }}
               </div>
             </div>
             <div class="compare_score_inner">
               <div class="compare_score_right" v-if="userData2.length > 0">
-                总分：{{ userData2[userData2.length - 1].dimensionScore }}
+                总分：{{ userData2[0].dimensionScore }}
               </div>
               <div class="compare_result" v-if="userData2.length > 0">
-                结论：{{ userData2[userData2.length - 1].dimensionSymptom }}、{{
-                  userData2[userData2.length - 1].dimensionImprovement
+                结论：{{ userData2[0].dimensionSymptom }}、{{
+                  userData2[0].dimensionImprovement
                 }}
               </div>
             </div>
@@ -148,7 +148,8 @@
           <div ref="echarts_zhu" style="width: 100%; height: 600px"></div>
           <div class="cpmpare_all" v-if="userData1.length > 0 && userData2.length > 0">
             <div v-for="(item, index) in userData1" :key="item.id">
-              <div v-show="index<userData2.length-1">
+              <div v-show="item.dimensionName!='总分'">
+              <!-- <div v-show="index<userData2.length-1"> -->
                 <div class="dimensionality_out">
                   <div class="left">
                     <span class="totol_all">维度：</span
@@ -165,7 +166,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -179,7 +180,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -194,7 +195,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -207,7 +208,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -222,7 +223,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) >
+                          parseFloat(userData1[index].dimensionScore) <
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -235,7 +236,7 @@
                     ><span
                       :style="{
                         color:
-                          parseFloat(userData1[index].dimensionScore) <
+                          parseFloat(userData1[index].dimensionScore) >
                           parseFloat(userData2[index].dimensionScore)
                             ? 'red'
                             : '',
@@ -479,6 +480,10 @@ export default {
       xAxis: {
         type: "category",
         data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+        axisLabel:{
+          interval:0,
+          // rotate:'45'
+        }
       },
       yAxis: {
         type: "value",
@@ -529,11 +534,10 @@ export default {
       this.$http.get(url, {}, (res) => {
         console.log("res");
         console.log(res)
+        debugger;
         if (res && res.code == 200) {
           this.orgName1 = res.data.user.orgName;
-          let a = res.data.report.filter((item) => {
-            return item.isIcon == "1";
-          });
+          let a = res.data.report
 
           this.userData1 = a;
           if (this.userData2.length == 0) {
@@ -570,18 +574,22 @@ export default {
       });
     },
     formatterDataW(a, flag, index) {
+      debugger;
       let scoreList = [];
       let scoreDes = [];
       let nameList = [];
       let zhuNameList = [];
-      for (let i = 0; i < a.length - 1; i++) {
-        //
-        scoreList.push(parseInt(a[i].dimensionScore));
+      for (let i = 0; i < a.length ; i++) {
+        if(a[i].dimensionName!='总分'){
+          scoreList.push(parseInt(a[i].dimensionScore));
         scoreDes.push(a[i].dimensionAnalysis);
 
         let ob = { name: a[i].dimensionName, max: 100 };
         nameList.push(ob);
         zhuNameList.push(a[i].dimensionName);
+        }
+        //
+        
       }
       this.echarts_zhuname_list = zhuNameList;
       if (index == "1") {
@@ -757,7 +765,9 @@ export default {
     margin-right: 10px;
     display: flex;
     justify-content: space-between;
+    flex-direction: column;
     .compare_plan_time {
+      margin-top: 6px;
       color: #999999;
     }
   }
@@ -767,7 +777,9 @@ export default {
     flex: 1;
     display: flex;
     justify-content: space-between;
+    flex-direction: column;
     .compare_plan_time {
+      margin-top: 6px;
       color: #999999;
     }
   }