From 44eb7b35097b5ca6819fa34fef59df5de535c4d6 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 11 Apr 2024 20:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/home/index.vue | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index afc392697..08df9be1d 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -683,16 +683,15 @@ export default {
         this.$message.error(msg);
       }
     },
-
     initEcharts() {
       this.$http.get("/actual/base/residentIntegrity/resiCategoryStats/byOrg/query4Org").then(({ data: { data } }) => {
         this.myBarchart = echarts.init(document.getElementById("myBarchart"));
         let xData = data.categoryStatsDatas.map(item => item.resiCategoryName)
-        let resiToal = data.categoryStatsDatas.map(item => item.total)
-        let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
+        // let integratedNum = data.categoryStatsDatas.map(item => item.integratedNum)
+        // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
         let option = {
           backgroundColor: '#fff',
-          color: ['#f7ca60', '#448cf6', ],
+          color: ['#448cf6', '#f7ca60', ],
           tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -702,7 +701,7 @@ export default {
           legend: {
             x: 'center',
             bottom: '8%',
-            data: ['分类居民总数', '分类信息不完整数']
+            data: ['分类信息完整数', '分类信息不完整数']
           },
           grid: { //图表的位置
             top: '5%',
@@ -725,27 +724,34 @@ export default {
             data: xData
           }],
           series: [{
-            name: '分类居民总数',
+            name: '分类信息完整数',
             type: 'bar',
             stack: '总量',
             barWidth: '30px',
-            data:resiToal ,
+            data: data.categoryStatsDatas.map((item, index) => ({
+            value: item.integratedNum,
+            extraProperty: item.resiCategory
+          })),
           },
           {
             name: '分类信息不完整数',
             type: 'bar',
             stack: '总量',
-            data:nonIntegratedNum,
+            data: data.categoryStatsDatas.map((item, index) => ({
+            value: item.nonIntegratedNum,
+            extraProperty: item.resiCategory
+          })),
           }
           ]
         };
         this.myBarchart.setOption(option);
         window.addEventListener("resize", this.handleWindowResize);
-        myBarchart.on("click", (e) => {
+        this.myBarchart.on("click", (e) => {
+          console.log(e);
           this.$router.push({
-            path: "/main/base-resi",
+            path: "/main/base-nonIntResi-nonIntResi",
             query: {
-              param1: e.name,
+              resiCategory: e.data.extraProperty,
             }
           });