From 77026638538dd302137f41d4020540cbb45bf207 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Thu, 19 Jun 2025 10:33:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E9=97=AE=E9=A2=98=E6=95=B0?=
 =?UTF-8?q?=E6=A6=9C=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E4=BF=A1=E8=AE=BF=E7=9A=84=E6=8A=9A=E6=85=B0=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/datav/chart-bar.vue            |  8 +-
 .../datav/subonedatav/SubOneRightsComfort.vue | 89 ++-----------------
 2 files changed, 9 insertions(+), 88 deletions(-)

diff --git a/src/components/datav/chart-bar.vue b/src/components/datav/chart-bar.vue
index 215e79d..c77b960 100644
--- a/src/components/datav/chart-bar.vue
+++ b/src/components/datav/chart-bar.vue
@@ -30,7 +30,7 @@
             placement="top-start"
         >
           <div class="popover_content">
-            <p> <span class="popover_border" style="background-color: #63e700"></span>市局下发问题数：<span style="font-weight: 800">{{item.cityNumber}}</span></p>
+            <p> <span class="popover_border" style="background-color: #63e700"></span>市局下发问题数：<span style="font-weight: 800">{{item.cityNumber }}</span></p>
             <p> <span class="popover_border" style="background-color: #399372"></span>二级机构下发问题数：<span style="font-weight: 800">{{item.countyNumber}}</span></p>
           </div>
           <template #reference>
@@ -39,7 +39,7 @@
                   class="bar-item_content-bar-item"
                   :style="{
 
-                        width: `${(item.cityNumber / item.denominator) * 100}%`,
+                        width: `${(item.cityNumber / (item.denominator?item.denominator:item.value) ) * 100}%`,
                        background:  `#63e700`,
 
                     }"
@@ -47,7 +47,7 @@
               </div>
               <div class="bar-item_content-bar-item" :style="{
 
-            width:`${(item.countyNumber / item.denominator) * 100}%`,
+            width:`${(item.countyNumber / (item.denominator?item.denominator:item.value)) * 100}%`,
             background:  `#399372`,
           }">
               </div>
@@ -239,7 +239,7 @@ function getColor(val) {
       height: 100%;
     }
     .bar-item_content-bar-item{
-      height: 18px;
+      height: 13px;
       transition: width 0.3s;
       background: linear-gradient(270deg, #63e700 0%, #19674c 100%);
     }
diff --git a/src/views/datav/subonedatav/SubOneRightsComfort.vue b/src/views/datav/subonedatav/SubOneRightsComfort.vue
index e22da76..26369e1 100644
--- a/src/views/datav/subonedatav/SubOneRightsComfort.vue
+++ b/src/views/datav/subonedatav/SubOneRightsComfort.vue
@@ -243,6 +243,7 @@ const time = ref([
   moment().startOf("year").format("YYYY-MM-DD"),
   moment().format("YYYY-MM-DD"),
 ]);
+
 const fxsjRightsRank = ref([
   {
     label: "岳麓分局",
@@ -328,92 +329,10 @@ const jsdwRightsRank = ref([
     value: 4
   },
 
-]);    // 局属单位维权案件情况
+]);    // 派出所抚慰金额情况
 const fxsjComfortMoneyRank = ref([
-  {
-    label: "岳麓分局",
-    value: 53
-  },
-  {
-    label: "芙蓉分局",
-    value: 20
-  },
-  {
-    label: "天心分局",
-    value: 20
-  },
-  {
-    label: "雨花分局",
-    value: 19
-  },
-  {
-    label: "浏阳市局",
-    value: 17
-  },
-  {
-    label: "宁乡市局",
-    value: 11
-  },
-  {
-    label: "开福分局",
-    value: 11
-  },
-  {
-    label: "望城分局",
-    value: 9
-  },
-  {
-    label: "长沙县局",
-    value: 9
-  },
-  {
-    label: "高新分局",
-    value: 4
-  },
-
-]);    // 分县市局抚慰金额情况
+]);    // 大队抚慰金额情况
 const jsdwComfortMoneyRank = ref([
-  {
-    label: "岳麓分局",
-    value: 33
-  },
-  {
-    label: "芙蓉分局",
-    value: 20
-  },
-  {
-    label: "天心分局",
-    value: 20
-  },
-  {
-    label: "雨花分局",
-    value: 19
-  },
-  {
-    label: "浏阳市局",
-    value: 17
-  },
-  {
-    label: "宁乡市局",
-    value: 11
-  },
-  {
-    label: "开福分局",
-    value: 11
-  },
-  {
-    label: "望城分局",
-    value: 9
-  },
-  {
-    label: "长沙县局",
-    value: 9
-  },
-  {
-    label: "高新分局",
-    value: 4
-  },
-
 ]);    // 局属单位抚慰金额情况
 const comfortOverview = ref({
   comfortCaseTotal: 0,
@@ -441,6 +360,8 @@ const getRightsRankList = async (departId, timeValue) => {
   fxsjRightsRank.value = res.fxsjRightsRankList;
   jsdwRightsRank.value = res.jsdwRightsRankList;
   comfortOverview.value=res.comfortOverview;
+  fxsjComfortMoneyRank.value =res.fxsjComfortMoneyRank;
+  jsdwComfortMoneyRank.value =res.jsdwComfortMoneyRank;
 }
 // 中央总览
 // const getComfortOverview = async (timeValue) => {