修改文本

src/components/CompareUser.vue

@@ -72,7 +72,9 @@
         style="border-radius: 40px"
       >
         <div slot="title">
-          <p style="text-align: center; margin-bottom: 20px; font-weight: 700">同一用户不同计划对比</p>
+          <p style="text-align: center; margin-bottom: 20px; font-weight: 700">
+            同一用户不同计划对比
+          </p>
           <div class="compare_plan">
             <div class="compare_plan_out1">
               <span class="compare_plan_name" v-if="multipleSelection[0]"
@@ -144,6 +146,59 @@
           </div>
           <div ref="echarts_ld" style="width: 100%; height: 600px"></div>
           <div ref="echarts_zhu" style="width: 100%; height: 600px"></div>
+          <!-- <div v-for=" (index,item) in userData1" :key="index">
+            {{item}}
+          </div> -->
+          <!-- {{ userData1 }} -->
+          <div class="cpmpare_all" v-if="userData1.length > 0 && userData2.length > 0">
+            <div class="compare_score_detail_left">
+              <div v-for="(item, index) in userData1" :key="item.id">
+                <div class="compare_score_inner" v-show="userData1.length - 1 !== index">
+                  <!-- {{index}}{{item}} -->
+                  <div class="compare_score_left_back">
+                    维度：{{ item.dimensionName }}
+                  </div>
+                  <div class="compare_score_left">总分：{{ item.dimensionScore }}</div>
+
+                  <div class="compare_result_new">
+                    <span class="title">结论：</span>{{ item.dimensionSymptom }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">说明：</span> {{ item.dimensionDesc }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">分析：</span> {{ item.dimensionImprovement }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">建议：</span> {{ item.dimensionSuggestion }}
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="compare_score_detail_right">
+              <div v-for="(item, index) in userData2" :key="item.id">
+                <div class="compare_score_inner" v-show="userData2.length - 1 !== index">
+                  <div class="compare_score_right_back">
+                    维度：{{ item.dimensionName }}
+                  </div>
+                  <div class="compare_score_right">总分：{{ item.dimensionScore }}</div>
+
+                  <div class="compare_result_new">
+                    <span class="title">结论：</span>{{ item.dimensionSymptom }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">说明：</span> {{ item.dimensionDesc }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">分析：</span> {{ item.dimensionImprovement }}
+                  </div>
+                  <div class="compare_result_new">
+                    <span class="title">建议：</span> {{ item.dimensionSuggestion }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </el-dialog>
     </div>
@@ -616,6 +671,22 @@ export default {
   .compare_score_inner {
     padding-left: 20px;
     flex: 1;
+    .compare_score_left_back {
+      color: #006fff;
+      margin-top: 20px;
+      margin-bottom: 10px;
+      font-size: 20px;
+      letter-spacing: 3px;
+      background-color: #f1f7ff;
+    }
+    .compare_score_right_back {
+      color: #ff3014;
+      margin-top: 20px;
+      margin-bottom: 10px;
+      font-size: 20px;
+      letter-spacing: 3px;
+      background-color: #fff4f2;
+    }
     .compare_score_left {
       color: #006fff;
       margin-top: 20px;
@@ -634,6 +705,118 @@ export default {
       font-size: 20px;
       letter-spacing: 3px;
     }
+    .compare_result_new {
+      font-size: 20px;
+      letter-spacing: 3px;
+      margin-top: 10px;
+      .title {
+        color: #006fff;
+      }
+    }
+  }
+}
+.cpmpare_all {
+  display: flex;
+  .compare_score_detail_left {
+    flex: 1;
+    .compare_score_inner {
+      padding-left: 20px;
+      flex: 1;
+      .compare_score_left_back {
+        color: #006fff;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+        background-color: #f1f7ff;
+      }
+      .compare_score_right_back {
+        color: #ff3014;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+        background-color: #fff4f2;
+      }
+      .compare_score_left {
+        color: #006fff;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_score_right {
+        color: #ff3014;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_result {
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_result_new {
+        font-size: 20px;
+        letter-spacing: 3px;
+        margin-top: 10px;
+        .title {
+          color: #006fff;
+        }
+      }
+    }
+  }
+
+  .compare_score_detail_right {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    .compare_score_inner {
+      padding-left: 20px;
+      flex: 1;
+      .compare_score_left_back {
+        color: #006fff;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+        background-color: #f1f7ff;
+      }
+      .compare_score_right_back {
+        color: #ff3014;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+        background-color: #fff4f2;
+      }
+      .compare_score_left {
+        color: #006fff;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_score_right {
+        color: #ff3014;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_result {
+        font-size: 20px;
+        letter-spacing: 3px;
+      }
+      .compare_result_new {
+        font-size: 20px;
+        letter-spacing: 3px;
+        margin-top: 10px;
+        .title {
+          color: #006fff;
+        }
+      }
+    }
   }
 }
 </style>

src/components/Report.vue

@@ -49,7 +49,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="auto" align="center">
                   <template slot-scope="scope">
-                    <div class="detail_button_out" v-if="scope.row.isComplete=='1'">
+                    <div class="detail_button_out" v-if="scope.row.isComplete == '1'">
                       <div class="detail_button" @click="queryRport(scope.row)">
                         <img style="width: 20px" src="../assets/img/table/search.png" />
                         <span>查看报告</span>
@@ -157,15 +157,37 @@
                   </div>
 
                   <div
-                    v-for="(item, index) in echarts_name_list"
+                    v-for="(item, index) in reportDataAll"
                     :key="index"
-                    style="padding-top: 60px"
+                    style="padding-top: 20px"
                   >
-                    <div class="des_zhishu">{{ item.name }}</div>
-                    <div class="report_des_out">
-                      <div class="score">分数：{{ echarts_data_list[index] }}</div>
-                      <div class="score">分析报告：</div>
-                      <div class="des">{{ echarts_des_list[index] }}</div>
+                    <div v-show="reportDataAll.length - 1 != index" class="des_zhishu">
+                      {{ item.dimensionName }}
+                    </div>
+                    <div
+                      class="report_des_out"
+                      v-show="reportDataAll.length - 1 != index"
+                    >
+                      <div class="score">分数：{{ item.dimensionScore }}</div>
+                      <div class="score">结论：{{ item.dimensionSymptom }}</div>
+                      <!-- <div class="score">分析：</div> -->
+                      <div class="scoreAsy">
+                        <span class="scoreAsyTitle">分析：</span
+                        ><span class="scoreAsyDes">{{item.dimensionImprovement }}</span>
+                      </div>
+                      <!-- <div class="des">{{ item.dimensionImprovement }}</div> -->
+                      <div class="scoreAsy">
+                        <span class="scoreAsyTitle">说明：</span
+                        ><span class="scoreAsyDes">{{item.dimensionDesc}}</span>
+                      </div>
+                      <div class="scoreAsy">
+                        <span class="scoreAsyTitle">建议：</span
+                        ><span class="scoreAsyDes">{{item.dimensionSuggestion}}</span>
+                      </div>
+                      <!-- <div class="score">说明：</div>
+                      <div class="des">{{ item.dimensionDesc }}</div> -->
+                      <!-- <div class="score">建议：</div>
+                      <div class="des">{{ item.dimensionSuggestion }}</div> -->
                     </div>
                   </div>
                 </div>
@@ -219,7 +241,8 @@ export default {
 
       //获取报告总数据
       reportData: [],
-      //
+      //获取不过滤的数据
+      reportDataAll: [],
       echarts_des_list: ["", "", "", "", "", ""],
       echarts_data_list: [10, 20, 30, 40, 0, 0],
       echarts_name_list: [
@@ -305,7 +328,6 @@ export default {
     },
     //查询报告 //根据planId 和用户编号
     queryRport(val) {
-  
       let params = {
         planId: val.id,
         userNo: this.proDataLin.userNo,
@@ -320,7 +342,10 @@ export default {
         console.log(res);
         if (res.code == 200) {
           // this.reportData = res.data;
-
+          console.log("res");
+          console.log(res);
+          this.reportDataAll = res.data.report;
+          debugger;
           let a = res.data.report.filter((item) => {
             return item.isIcon == "1";
           });
@@ -382,7 +407,6 @@ export default {
     isComUser(val, row) {
       console.log(this.multipleSelection);
       //添加已选用户
-
       let data = [];
       if (val == 1) {
         for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -665,10 +689,10 @@ export default {
       }
 
       .totol_result_des {
-        font-size: 30px;
+        font-size: 20px;
         margin-left: 50px;
         letter-spacing: 3px;
-        line-height: 50px;
+        line-height: 30px;
       }
     }
 
@@ -707,29 +731,46 @@ export default {
 
     .des_zhishu {
       color: #222222;
-      font-size: 49px;
+      font-size: 24px;
       letter-spacing: 3px;
     }
 
     .report_des_out {
-      margin-top: 40px;
+      margin-top: 10px;
       background-color: #f7f7f7;
       padding: 20px 40px;
       border-radius: 40px;
 
       .score {
         color: #48d68e;
-        font-size: 30px;
-        line-height: 60px;
+        font-size: 20px;
+        line-height: 30px;
         letter-spacing: 3px;
       }
 
       .des {
         color: #000000;
-        font-size: 24px;
-        line-height: 40px;
+        font-size: 18px;
+        line-height: 28px;
         letter-spacing: 3px;
       }
+      .scoreAsy {
+        display: flex;
+        flex-direction: row;
+        .scoreAsyTitle {
+       
+          color: #48d68e;
+          font-size: 20px;
+          line-height: 30px;
+          letter-spacing: 3px;
+        }
+        .scoreAsyDes {
+          flex: 1;
+          font-size: 20px;
+          line-height: 30px;
+          letter-spacing: 3px;
+        }
+      }
     }
 
     .start_button_out {