From cd9b9788b62d26b2f0726d7c23a6112e816cf052 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Thu, 20 Jul 2023 16:37:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataAnalysis/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/dataAnalysis/index.vue b/src/views/dataAnalysis/index.vue
index 98fcb37..9e2ad03 100644
--- a/src/views/dataAnalysis/index.vue
+++ b/src/views/dataAnalysis/index.vue
@@ -198,7 +198,7 @@ export default {
       riskNum: 0,
       midhignNum: 0,
       colorList1: ["#2197FF", "#1571EA"],
-      colorList2: ["#0A56BD", "#1571EA", "#2197FF", "#3DA5FF", "#72BEFF"],
+      colorList2: ["#0A56BD", "#1571EA", "#2197FF", "#3DA5FF", "#1571EA"],
       colorList3: ["#47B7A0", "#FFA424", "#EB7126"],
       colorList4: ["#3B4466", "#1571EA"],
       pieData1: [
@@ -210,7 +210,7 @@ export default {
         { value: 0, name: "50-59" },
         { value: 0, name: "60-69" },
         { value: 0, name: "70-79" },
-        // { value: 0, name: "80及以上" },
+        { value: 0, name: "其他" },
       ],
       pieData3: [
         { value: 0, name: "低风险" },
@@ -340,11 +340,12 @@ export default {
     getAgeCount() {
       ageCount().then((res) => {
         if (res.code == 1) {
+          let d = res.data
           this.pieData2[0].value = res.data.num1
           this.pieData2[1].value = res.data.num2
           this.pieData2[2].value = res.data.num3
           this.pieData2[3].value = res.data.num4
-          // this.pieData2[4].value = res.data.num5
+          this.pieData2[4].value = d.num - d.num1 - d.num2 - d.num3 - d.num4
           this.ageNum = res.data.num
         }
       })
@@ -363,8 +364,8 @@ export default {
     getCheckCondition() {
       checkCondition().then((res) => {
         if (res.code == 1) {
-          this.pieData4[0].value = res.data.checked
-          this.pieData4[1].value = res.data.unChecked
+          this.pieData4[0].value = res.data.unChecked
+          this.pieData4[1].value = res.data.checked
           this.midhignNum = res.data.total
         }
       })
-- 
2.22.0