From 98672898e16d78f608eb616ef0a538fcd2cc6c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Wed, 23 Dec 2020 17:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/e-charts/starlist.vue      | 35 ++++++++++++++-------
 src/pages/data-analysis/my-service.vue    | 37 +++++++++++++++++------
 src/pages/data-analysis/org-service.vue   | 25 ++++++++++++---
 src/pages/data-analysis/super-service.vue | 25 ++++++++++++---
 4 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/src/components/e-charts/starlist.vue b/src/components/e-charts/starlist.vue
index 1339e2d..7afac7b 100644
--- a/src/components/e-charts/starlist.vue
+++ b/src/components/e-charts/starlist.vue
@@ -1,6 +1,10 @@
 <template>
   <ul class="star_list apaas_scroll">
-    <li class="item_list" v-for="(option, index) in options" :key="'star_info_' + index">
+    <li
+      class="item_list"
+      v-for="(option, index) in options"
+      :key="'star_info_' + index"
+    >
       <el-rate
         v-if="show_star"
         class="item-rate"
@@ -12,11 +16,15 @@
       <span v-else class="data_title">{{ option.title }}</span>
       <el-progress
         class="item-progress"
-        :percentage="getPercent(option.count)"
+        :percentage="Number(getPercent(option.count))"
         :show-text="false"
         :color="show_star ? color : colors[index]"
       ></el-progress>
-      <span v-if="!show_star" class="item_text_1" v-text="option.percent + '%'"></span>
+      <span
+        v-if="!show_star"
+        class="item_text_1"
+        v-text="option.percent + '%'"
+      ></span>
       <span class="item-text" v-text="option.count + '个'"></span>
     </li>
   </ul>
@@ -27,28 +35,33 @@ export default {
   props: {
     options: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     total: {
       type: Number,
-      default: () => 10
+      default: () => 10,
     },
     show_star: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
       color: "#e56600",
-      colors: ["#25bdb1", "#f5ab4c", "#e15260", "#274fee", "#58617a"]
+      colors: ["#25bdb1", "#f5ab4c", "#e15260", "#274fee", "#58617a"],
     };
   },
   methods: {
     getPercent(value) {
-      return Math.min((value / this.total) * 100, 100);
-    }
-  }
+      if (value == 0) {
+        return 0;
+      } else {
+        let num = Math.min((value / this.total) * 100, 100);
+        return num;
+      }
+    },
+  },
 };
 </script>
 
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 54312f2..203d015 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -472,31 +472,31 @@ export default {
     starlistData: [
       {
         star: 5,
-        count: 5,
+        count: 0,
         unit: "个",
       },
       {
         star: 4,
-        count: 4,
+        count: 0,
         unit: "个",
       },
       {
         star: 3,
-        count: 3,
+        count: 0,
         unit: "个",
       },
       {
         star: 2,
-        count: 2,
+        count: 0,
         unit: "个",
       },
       {
         star: 1,
-        count: 1,
+        count: 0,
         unit: "个",
       },
     ], // 服务评分
-    starlistTotal: 15,
+    starlistTotal: 0,
     hotSearchHeader: [], // 热门搜索 表头
     hotSearchData: [], // 热门搜索 数据
     graph_arr: {
@@ -722,10 +722,27 @@ export default {
         })
         .then((response) => {
           if (response.data.success == 1) {
-            this.commentlistData = response.data.data.concat(
-              this.commentlistData
-            );
-            this.last_id = this.commentlistData[0].last_id;
+            if (this.right_3_state == 0) {
+              let data = response.data.data || [];
+              this.commentlistData = data.concat(this.commentlistData);
+              if (this.commentlistData && this.commentlistData.length != 0) {
+                this.last_id = this.commentlistData[0].last_id;
+              }
+            } else {
+              let data = response.data.data;
+              this.starlistData[0].count = data.score5;
+              this.starlistData[1].count = data.score4;
+              this.starlistData[2].count = data.score3;
+              this.starlistData[3].count = data.score2;
+              this.starlistData[4].count = data.score1;
+              this.starlistTotal =
+                data.score5 +
+                data.score4 +
+                data.score3 +
+                data.score2 +
+                data.score1;
+              console.log(this.starlistData, this.starlistTotal)
+            }
           }
         });
     },
diff --git a/src/pages/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue
index 8e91967..ae1ecfc 100644
--- a/src/pages/data-analysis/org-service.vue
+++ b/src/pages/data-analysis/org-service.vue
@@ -634,12 +634,27 @@ export default {
         })
         .then((response) => {
           if (response.data.success == 1) {
-            if (response.data.data) {
-              this.commentlistData = response.data.data.concat(
-                this.commentlistData
-              );
+            if (this.right_3_state == 0) {
+              let data = response.data.data || [];
+              this.commentlistData = data.concat(this.commentlistData);
+              if (this.commentlistData && this.commentlistData.length != 0) {
+                this.last_id = this.commentlistData[0].last_id;
+              }
+            } else {
+              let data = response.data.data;
+              this.starlistData[0].count = data.score5;
+              this.starlistData[1].count = data.score4;
+              this.starlistData[2].count = data.score3;
+              this.starlistData[3].count = data.score2;
+              this.starlistData[4].count = data.score1;
+              this.starlistTotal =
+                data.score5 +
+                data.score4 +
+                data.score3 +
+                data.score2 +
+                data.score1;
+              console.log(this.starlistData, this.starlistTotal)
             }
-            this.last_id = this.commentlistData[0].last_id;
           }
         });
     },
diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue
index a5a2198..bc83164 100644
--- a/src/pages/data-analysis/super-service.vue
+++ b/src/pages/data-analysis/super-service.vue
@@ -628,11 +628,26 @@ export default {
         })
         .then((response) => {
           if (response.data.success == 1) {
-            if (response.data.data) {
-              this.commentlistData = response.data.data.concat(
-                this.commentlistData
-              );
-              this.last_id = this.commentlistData[0].last_id;
+            if (this.right_3_state == 0) {
+              let data = response.data.data || [];
+              this.commentlistData = data.concat(this.commentlistData);
+              if (this.commentlistData && this.commentlistData.length != 0) {
+                this.last_id = this.commentlistData[0].last_id;
+              }
+            } else {
+              let data = response.data.data;
+              this.starlistData[0].count = data.score5;
+              this.starlistData[1].count = data.score4;
+              this.starlistData[2].count = data.score3;
+              this.starlistData[3].count = data.score2;
+              this.starlistData[4].count = data.score1;
+              this.starlistTotal =
+                data.score5 +
+                data.score4 +
+                data.score3 +
+                data.score2 +
+                data.score1;
+              console.log(this.starlistData, this.starlistTotal)
             }
           }
         });
-- 
2.26.0