From a8bbdde89c092e36bd701fa9ae15ac781f5a8e9c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 15 Aug 2025 12:08:14 +0800
Subject: [PATCH] push

---
 src/api/charts.js                     |   35 +-
 src/assets/leader0.png                |  Bin 0 -> 261 bytes
 src/assets/leader1.png                |  Bin 0 -> 11128 bytes
 src/assets/leader2.png                |  Bin 0 -> 9939 bytes
 src/assets/leader3.png                |  Bin 0 -> 9984 bytes
 src/assets/leadericon.png             |  Bin 0 -> 498 bytes
 src/views/jsc/components/barChart.vue |  117 +-
 src/views/jsc/components/mapChart.vue |  141 ++-
 src/views/jsc/index.vue               | 1175 +++++++++++++-------
 src/views/jsc/leader.vue              | 1478 +++++++++++++++++--------
 10 files changed, 1939 insertions(+), 1007 deletions(-)
 create mode 100644 src/assets/leader0.png
 create mode 100644 src/assets/leader1.png
 create mode 100644 src/assets/leader2.png
 create mode 100644 src/assets/leader3.png
 create mode 100644 src/assets/leadericon.png

diff --git a/src/api/charts.js b/src/api/charts.js
index 79e0024..e9d9821 100644
--- a/src/api/charts.js
+++ b/src/api/charts.js
@@ -1,51 +1,56 @@
-import request from '@/utils/request'
-
+import request from '@/utils/request'
+
 export function stocksCharts(params) {
   return request({
     url: '/api/admin/chart/stocks',
     method: 'get',
     params: params
   })
-}
-
+}
+
 export function outboundsCharts(params) {
   return request({
     url: '/api/admin/chart/outbounds',
     method: 'get',
     params: params
   })
-}
-
+}
+
 export function updateInventorys(params) {
   return request({
     url: '/api/admin/chart/update-inventorys',
     method: 'get',
     params: params
   })
-}
-
+}
+
 export function fenleiCharts(params) {
   return request({
     url: '/api/admin/chart/fenlei',
     method: 'get',
     params: params
   })
-}
-
+}
+
 export function homeCharts(params) {
   return request({
     url: '/api/admin/chart/home-v2',
     method: 'get',
     params: params
   })
-}
-
+}
+
 export function soCharts(params) {
   return request({
     url: '/api/admin/chart/stocks-and-outbounds',
     method: 'get',
     params: params
   })
-}
-
-
+}
+export function finishCharts(params) {
+  return request({
+    url: '/api/admin/chart/finish',
+    method: 'get',
+    params: params
+  })
+}
\ No newline at end of file
diff --git a/src/assets/leader0.png b/src/assets/leader0.png
new file mode 100644
index 0000000000000000000000000000000000000000..71265f8bacc4f903392d5e6d1158e986c3920ade
GIT binary patch
literal 261
zcmV+g0s8)lP)<h;3K|Lk000e1NJLTq000mG000;W1^@s6^PqhU0002YNkl<ZIE|&$
zuZluJ7>4oZh;3kuHZNe?7Q0oG)g*(-x}ZsuQ9(r1G?!tq$ll1_!-22v$`|&4|C#xo
zb~tB#yfAPIALWnN9n0W)&%UU=IjnVkl)eSf);@}}04-o<0kkh4<--Ehfvt~H<N{g;
z7+3&p<)bt#KoeM40B!7}d|CiKckoeaxq#LNMixMuTY;qo_y#t)fB?fXxZhl0S_bz+
z<~5#y-Ty->pwmMcT=f@A1*+*ez}56r;BI;<Fu9$c0-S*T!#BVM>X0zkm&-1x00000
LNkvXXu0mjf5B6}D

literal 0
HcmV?d00001

diff --git a/src/assets/leader1.png b/src/assets/leader1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a5445c25217f7e5e03d27975064e4e14adb1214
GIT binary patch
literal 11128
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
KMNUMnLSTZtXL;NJ

literal 0
HcmV?d00001

diff --git a/src/assets/leader2.png b/src/assets/leader2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c3779c19f5146322476fb76aa8514ccd6bfa4b0
GIT binary patch
literal 9939
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
Rv1|YU002ovPDHLkV1m}uEHwZC

literal 0
HcmV?d00001

diff --git a/src/assets/leader3.png b/src/assets/leader3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6982cc9c8ae253d0393517004a1330b07a4c930b
GIT binary patch
literal 9984
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
KMNUMnLSTY4dP2_t

literal 0
HcmV?d00001

diff --git a/src/assets/leadericon.png b/src/assets/leadericon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c345be83ad77fd093553712d7f789cec6f59aeac
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000jF000yS1^@s6QpaZ!0005GNkl<ZIE{tV
zy=xUg6b10#d#s|MpaBVjTA0G5P{d$mD+pF1VpQS>!T-U|LM-gHvC>4)q_GujEQFv0
zOw{0Kt0-8gAjG(ty|Q6noIGFjz=64U&)K<i=T0kLO~|kg=W!MXun9l#6nAhBzdG_(
z%&(XSaUVn0##@}ge647!P#IL2RvBvIwYW#+aYt7~rN9)nX8V1|Exg1IoWnr#Z42&V
zxKKHTeVOqM4&!5%yM}R=wKeu*q=+SFx=why%cyD61suZ8j;<Xkh9iZBFCxWU7Ux`y
z6q8vzTtsU1WjlQRN2hCi&er{fv~1XxU01v5buaAAa^KpK%toSNe<WjBoO2+Oku09A
z&68cC8<AX$q@CpsM)EL{jahE0_4C2_dc4Q3t};L29s0V;?VNpg5o!4vF5`BWV0*(}
zxQd0g5~T^HC(ZhQe6Dn}))duZtNw9d49~FPA6L~GmZdsqM;RKvjxsJ~aW7tpGUht@
zqN+>zgX=hgqdj(g)Xew_idb!~%OAx|_KIqJs2>8-YV%U9Uxj+&j$s;`>#pKBzH|%o
oLC85D$;n6-A{mWj<}Xd+H^#Lvm;659dH?_b07*qoM6N<$f)l;$2mk;8

literal 0
HcmV?d00001

diff --git a/src/views/jsc/components/barChart.vue b/src/views/jsc/components/barChart.vue
index 0504087..1bbf8ff 100644
--- a/src/views/jsc/components/barChart.vue
+++ b/src/views/jsc/components/barChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart1" style="width:350px" class="bar3d-chart" />
+  <div ref="chart1" style="width:400px" class="bar3d-chart" />
 </template>
 
 <script>
@@ -10,38 +10,88 @@ export default {
   props: {
     xData: {
       type: Array,
-      default: []
+      default: () => []
     },
     yData: {
       type: Array,
-      default: []
+      default: () => []
     }
   },
   watch: {
-    xData(newVal) {
-      if (newVal) {
+    xData: {
+      handler(newVal) {
+        console.log('Bar3DChart xData 变化:', newVal)
+        console.log('Bar3DChart 当前 yData:', this.yData)
+        // 即使数据为空，也尝试初始化图表
         this.initChart()
         this.resizeChart()
-      }
+      },
+      immediate: true,
+      deep: true
+    },
+    yData: {
+      handler(newVal) {
+        console.log('Bar3DChart yData 变化:', newVal)
+        console.log('Bar3DChart 当前 xData:', this.xData)
+        // 即使数据为空，也尝试初始化图表
+        this.initChart()
+        this.resizeChart()
+      },
+      immediate: true,
+      deep: true
     }
   },
   mounted() {
+    console.log('Bar3DChart 组件挂载')
+    console.log('DOM 元素:', this.$refs.chart1)
+    
     this.chart = echarts.init(this.$refs.chart1)
+    console.log('ECharts 实例创建:', this.chart)
+    
+    // 初始化图表
+    this.initChart()
   },
   beforeDestroy() {
     if (this.chart) this.chart.dispose()
   },
   methods: {
     initChart() {
-      // this.chart = echarts.init(this.$refs.chart1)
+      console.log('Bar3DChart initChart 被调用')
+      console.log('当前 xData:', this.xData)
+      console.log('当前 yData:', this.yData)
+      
+      // 确保有默认数据
+      const xData = this.xData && this.xData.length > 0 ? this.xData : ['暂无数据']
+      const yData = this.yData && this.yData.length > 0 ? this.yData : [
+        {
+          name: '盘点',
+          type: 'bar',
+          data: [0],
+          itemStyle: { color: '#6ec6ff' }
+        },
+        {
+          name: '维护',
+          type: 'bar',
+          data: [0],
+          itemStyle: { color: '#4be3c1' }
+        }
+      ]
+      
       const option = {
         backgroundColor: 'transparent',
-        title: {
-          text: '待办任务',
-          left: 'center',
-          top: 0,
+        // title: {
+        //   text: '待办任务',
+        //   left: 'center',
+        //   top: 0,
+        //   textStyle: {
+        //     color: '#6dcde6'
+        //   }
+        // },
+        legend: {
+          data: yData.map(item => item.name),
+          top: 30,
           textStyle: {
-            color: '#6dcde6'
+            color: '#fff'
           }
         },
         grid: {
@@ -50,9 +100,15 @@ export default {
           bottom: 140,
           top: 80
         },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
         xAxis: {
           type: 'category',
-          data: this.xData,
+          data: xData,
           axisLine: {
             lineStyle: {
               color: '#6ec6ff'
@@ -60,7 +116,12 @@ export default {
           },
           axisLabel: {
             color: '#fff',
-            fontSize: 16
+            fontSize: 16,
+            interval: 0, // 强制显示所有标签
+            rotate: 45, // 标签旋转45度
+            textStyle: {
+              fontSize: 12 // 稍微减小字体大小以适应旋转后的显示
+            }
           }
         },
         yAxis: {
@@ -81,11 +142,12 @@ export default {
             fontSize: 16
           }
         },
-        series: [{
+        series: yData.map(item => ({
+          name: item.name,
           type: 'bar',
           barWidth: 40,
-          data: this.yData,
-          itemStyle: {
+          data: item.data,
+          itemStyle: item.itemStyle || {
             color: {
               type: 'linear',
               x: 0,
@@ -106,16 +168,21 @@ export default {
             shadowBlur: 10
           },
           label: {
-            show: true,
-            position: 'top',
-            color: '#fff',
-            fontSize: 18
+            show: false
           }
-        }]
+        }))
       }
+      
+      console.log('ECharts 配置:', option)
+      
       this.$nextTick(() => {
-        this.chart.setOption(option)
-      })
+        if (this.chart) {
+          this.chart.setOption(option)
+          console.log('图表配置已应用')
+        } else {
+          console.warn('图表实例不存在')
+        }
+      })
     },
     resizeChart() {
       if (this.chart) this.chart.resize()
@@ -129,4 +196,4 @@ export default {
     height: 400px;
     background: transparent;
   }
-</style>
+</style>
diff --git a/src/views/jsc/components/mapChart.vue b/src/views/jsc/components/mapChart.vue
index e68e550..88ee632 100644
--- a/src/views/jsc/components/mapChart.vue
+++ b/src/views/jsc/components/mapChart.vue
@@ -48,7 +48,7 @@ export default {
   props: {
     mapStyle:{
       type:String,
-      default:()=>{return 'width:700px;height:500px;position: relative;'}
+      default:()=>{return 'width:650px;height:500px;position: relative;'}
     }
     // mapData: {
     //   type: Array,
@@ -66,6 +66,7 @@ export default {
       wuziList:[],
       wuziTotal:0,
       cangkuObj:{},
+      warehouseData: [], // 仓库数量数据
       table: [{
         label: '序号',
         type: 'index',
@@ -486,24 +487,43 @@ export default {
       });
     },
     async zoomToArea(areaObj) {
+      console.log('点击区域:', areaObj);
+      
       // 1. 获取仓库点位数据
       const warehouseList = await this.getList(areaObj.id);
+      console.log('获取到的仓库列表:', warehouseList);
 
       // 2. 生成点位
-      this.warehousePoints = (warehouseList || []).map(item => ({
-        name: item.cangkumingcheng,
-        value: [Number(item.jingdu), Number(item.weidu)],
-        id: item.id,
-        item:item
-      }));
+      this.warehousePoints = (warehouseList || []).map(item => {
+        const jingdu = Number(item.jingdu);
+        const weidu = Number(item.weidu);
+        
+        // 验证坐标数据
+        if (isNaN(jingdu) || isNaN(weidu) || jingdu === 0 || weidu === 0) {
+          console.warn('仓库坐标无效:', item.cangkumingcheng, '经度:', item.jingdu, '纬度:', item.weidu);
+          return null;
+        }
+        
+        return {
+          name: item.cangkumingcheng,
+          value: [jingdu, weidu],
+          id: item.id,
+          item: item
+        };
+      }).filter(point => point !== null); // 过滤掉无效的坐标点
+      
+      console.log('生成的仓库点位:', this.warehousePoints);
+      console.log('有效仓库点位数量:', this.warehousePoints.length);
 
       // 3. 只更新geo的center和zoom，添加仓库点位
+      console.log('设置地图配置，仓库点位数量:', this.warehousePoints.length);
+      
       this.myChart.setOption({
         series: [
           {
             name: '区域',
             type: 'map',
-            mapType: 'china',
+            map: 'GX',
             geoIndex: 0,
             markPoint: {
               symbol: '',
@@ -526,16 +546,18 @@ export default {
             }
           },
           {
+            name: '仓库点位',
             type: 'scatter',
             coordinateSystem: 'geo',
             data: this.warehousePoints,
-            symbolSize: 12,
-            itemStyle: { color: '#f00' },
+            symbol: 'pin',
+            symbolSize: [16, 20],
+            itemStyle: { color: 'orange' },
             label: {
               show: true,
               formatter: '{b}',
               position: 'top',
-              color: 'red',
+              color: 'orange',
               fontSize: 12
             }
           }
@@ -545,6 +567,9 @@ export default {
           zoom: areaObj.zoom // 直接使用streetNameList中的zoom
         }
       });
+      
+      // 强制刷新地图
+      this.myChart.resize();
 
       // 重新绑定地图点击事件
       this.myChart.off('click');
@@ -570,13 +595,46 @@ export default {
       this.cangkuObj = {}
       this.wuziTotal = 0
       this.showData = false
-      // 只重置geo的配置，保留原始地图series
-      this.myChart.setOption({
-        series: [
-          {
+      
+      console.log('resetToFullMap - warehouseData:', this.warehouseData);
+      console.log('resetToFullMap - warehouseData.length:', this.warehouseData ? this.warehouseData.length : 0);
+      
+      // 重新调用 drawChart 来完全重置地图
+      this.drawChart();
+      
+      // 如果有仓库数据，重新应用仓库数量显示
+      if (this.warehouseData && this.warehouseData.length > 0) {
+        this.updateWarehouseData(this.warehouseData);
+      }
+      
+      // 强制刷新地图
+      this.myChart.resize();
+      
+      console.log('返回全图完成，仓库点位已清除，仓库数量应显示');
+    },
+    updateWarehouseData(warehouseData) {
+      // 更新仓库数量数据
+      this.warehouseData = warehouseData;
+      
+      // 更新地图上的区域标签，显示仓库数量
+      const updatedStreetList = this.streetNameList.map(street => {
+        const warehouseInfo = warehouseData.find(w => w.name === street.name);
+        if (warehouseInfo) {
+          return {
+            ...street,
+            warehouseCount: warehouseInfo.warehouseCount
+          };
+        }
+        return street;
+      });
+      
+      // 更新地图配置
+      if (this.myChart) {
+        this.myChart.setOption({
+          series: [{
             name: '区域',
             type: 'map',
-            mapType: 'china',
+            map: 'GX',
             geoIndex: 0,
             markPoint: {
               symbol: '',
@@ -592,40 +650,29 @@ export default {
                 borderColor: '#096dd9',
                 backgroundColor: '#fff',
                 formatter(val) {
-                  return val.data.name
+                  const street = updatedStreetList.find(s => s.name === val.data.name);
+                  if (street && street.warehouseCount !== undefined) {
+                    return `{name|${street.name}}\n{warehouse|仓库: ${street.warehouseCount}}`;
+                  }
+                  return val.data.name;
+                },
+                rich: {
+                  name: {
+                    color: '#333',
+                    fontSize: 12,
+                    fontWeight: 'bold'
+                  },
+                  warehouse: {
+                    color: 'orange',
+                    fontSize: 12
+                  }
                 }
               },
-              data: this.streetNameList
+              data: updatedStreetList
             }
-          },
-          {
-            type: 'scatter',
-            coordinateSystem: 'geo',
-            data: [] // 清空仓库点位
-          }
-        ],
-        geo: {
-          center: [120.585294, 31.299758], // 恢复全图中心点
-          zoom: 1 // 恢复全图缩放比例
-        }
-      });
-
-      // 重新绑定地图点击事件
-      this.myChart.off('click');
-      this.myChart.on('click', params => {
-        if (params.seriesType === 'scatter') {
-          this.getWuzi(params.data);
-        } else if (params.componentType === 'series' && params.seriesType === 'map') {
-          const areaName = params.name;
-          const areaObj = this.streetNameList.find(item => item.name === areaName);
-          if (areaObj) {
-            this.currentArea = areaObj;
-            this.zoomToArea(areaObj);
-          }
-        } else if (params.componentType === 'geo') {
-          this.resetToFullMap();
-        }
-      });
+          }]
+        });
+      }
     },
     async getWuzi(cangku) {
       console.log("warehouseId",cangku)
diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue
index bfe9488..2dfea00 100644
--- a/src/views/jsc/index.vue
+++ b/src/views/jsc/index.vue
@@ -1,62 +1,70 @@
 <template>
-  <div class="jsc" :style="bgStyle">
+  <div class="jsc" :style="bgStyle">
     <div class="jsc-view" @click="toLeader">切换视图</div>
     <div class="jscC">
       <div class="jscC-top">
         <div v-for="item in topObj">
           <div class="label">{{ item.label }}</div>
           <div class="value">
-            {{ item.value }} <span style="font-size: 0.2rem;">{{item.unit?item.unit:''}}</span>
+            {{ item.value }} <span style="font-size: 0.2rem">{{ item.unit ? item.unit : '' }}</span>
             <!-- <CountUp :end="item.value" :duration="6" ref="count" /> -->
           </div>
         </div>
       </div>
       <div class="jscC-center">
         <div class="jscC-center-left">
-          <div class="jscC-center-top">
-            <div class="jscC-center-left-title">年度物资动态</div>
-            <WarehouseTable></WarehouseTable>
-          </div>
           <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
           <div class="jscC-center-left-title">
             <span>重要防汛物资</span>
             <div>
-              <span :class="['custom-btn', { active: activeType === '市级' }]" @click="onTypeClick('市级')">市级</span>
-              <span :class="['custom-btn', { active: activeType === '全市' }]" @click="onTypeClick('全市')">全市</span>
+              <span
+                :class="['custom-btn', { active: activeType === '市级' }]"
+                @click="onTypeClick('市级')"
+                >市级</span
+              >
+              <span
+                :class="['custom-btn', { active: activeType === '全市' }]"
+                @click="onTypeClick('全市')"
+                >全市</span
+              >
             </div>
           </div>
           <div class="jscC-center-left-content">
             <div v-if="activeType === '市级'" v-for="item in upList">
-              <img :src="item.img" alt="">
-              <span>{{item.name}}：</span>
-              <span>{{item.value}}{{item.unit?item.unit:''}}</span>
+              <img :src="item.img" alt="" />
+              <span>{{ item.name }}：</span>
+              <span>{{ item.value }}{{ item.unit ? item.unit : '' }}</span>
             </div>
 
             <div v-if="activeType === '全市'" v-for="item in upListByFloodMaterials">
-              <img :src="item.img" alt="">
-              <span>{{item.name}}：</span>
-              <span>{{item.value}}{{item.unit?item.unit:''}}</span>
+              <img :src="item.img" alt="" />
+              <span>{{ item.name }}：</span>
+              <span>{{ item.value }}{{ item.unit ? item.unit : '' }}</span>
             </div>
-
-            <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
-            <!-- <span
-              v-for="item in Object.keys(chartDataMap)"
-              :key="item"
-              :class="['custom-btn', { active: activeType === item }]"
-              @click="handleTypeClick(item)"
-            >
-              {{ item }}
-            </span> -->
           </div>
-          <!-- <Bar3DChart></Bar3DChart> -->
-          <!-- <fenleiChart :chart-data="chartData" /> -->
+          <div class="jscC-center-top">
+            <div class="jscC-center-left-title">年度物资动态</div>
+            <WarehouseTable></WarehouseTable>
+          </div>
         </div>
         <div class="jscC-center-center">
           <echartsMap ref="echartsMap" />
-
         </div>
         <div class="jscC-center-right">
-          <Bar3DChart :x-data="xData" :y-data="yData" />
+          <div class="chart-header">
+            <div class="chart-title">已办任务</div>
+            <div class="time-tabs">
+              <span
+                v-for="item in finishTypeList"
+                :key="item.value"
+                :class="['time-tab', { active: finishType === item.value }]"
+                @click="onTimeTypeChange(item.value)"
+              >
+                {{ item.label }}
+              </span>
+            </div>
+          </div>
+          <Bar3DChart :x-data="chartXData" :y-data="chartYData" />
           <!-- <Pie3DChart></Pie3DChart> -->
         </div>
       </div>
@@ -72,487 +80,796 @@
 </template>
 
 <script>
-  import Bar3DChart from '../jsc/components/barChart.vue'
-  import fenleiChart from '../jsc/components/fenleiChart.vue'
-  import Pie3DChart from '../jsc/components/pieChart.vue'
-  import echartsMap from './components/mapChart.vue'
-  import WarehouseTable from './components/WarehouseTable.vue'
-
-  import {
-    fenleiCharts,
-    homeCharts,
-
-  } from '@/api/charts.js'
-  export default {
-    components: {
-      Bar3DChart,
-      Pie3DChart,
-      echartsMap,
-      fenleiChart,
-      WarehouseTable
-    },
-    data() {
-      return {
-        screenWidth: 0,
-        screenHeight: 0,
-        bgStyle: {
-          width: 0,
-          height: 0
+import Bar3DChart from '../jsc/components/barChart.vue'
+import fenleiChart from '../jsc/components/fenleiChart.vue'
+import Pie3DChart from '../jsc/components/pieChart.vue'
+import echartsMap from './components/mapChart.vue'
+import WarehouseTable from './components/WarehouseTable.vue'
+
+import { fenleiCharts, homeCharts,finishCharts } from '@/api/charts.js'
+export default {
+  components: {
+    Bar3DChart,
+    Pie3DChart,
+    echartsMap,
+    fenleiChart,
+    WarehouseTable
+  },
+  data() {
+    return {
+      screenWidth: 0,
+      screenHeight: 0,
+      bgStyle: {
+        width: 0,
+        height: 0
+      },
+      contentStyle: {
+        width: 0,
+        height: 0
+      },
+      upList: [],
+      upListByFloodMaterials: [],
+      topObj: [
+        {
+          label: '仓库数量',
+          value: 0,
+          id: 'cangku_count',
+          unit: '个'
         },
-        contentStyle: {
-          width: 0,
-          height: 0
+        {
+          label: '物资种类',
+          value: 0,
+          id: 'wuzizhonglei_count',
+          unit: '类'
         },
-        upList: [],
-        upListByFloodMaterials: [],
-        topObj: [{
-            label: '仓库数量',
-            value: 0,
-            id: 'cangku_count',
-            unit: '个'
-          }, {
-            label: '物资种类',
-            value: 0,
-            id: 'wuzizhonglei_count',
-            unit: '类'
-          },
-          // {
-          //   label: '本月出库',
-          //   value: 0,
-          //   id: 'chuku_month_count'
-          // }, {
-          //   label: '本月入库',
-          //   value: 0,
-          //   id: 'ruku_month_count'
-          // },
-          {
-            label: '本年度市级调度',
-            value: 0,
-            id: 'yingjidiaodu_count',
-            unit: '次'
-          }, {
-            label: '队伍数量',
-            value: 0,
-            id: 'team_count',
-            unit: '个'
-          }, {
-            label: '队伍出动人次',
-            value: 0,
-            id: 'team_article_total',
-            unit: '人次'
-          }
-          // {
-          //   label: '装备总数',
-          //   value: 0,
-          //   id: 'shebei_count'
-          // }, {
-          //   label: '盘点',
-          //   value: 0,
-          //   id: 'pan_count'
-          // }, {
-          //   label: '维护',
-          //   value: 0,
-          //   id: 'weihu_count'
-          // },
-        ],
-        bottomObj: [{
+        // {
+        //   label: '本月出库',
+        //   value: 0,
+        //   id: 'chuku_month_count'
+        // }, {
+        //   label: '本月入库',
+        //   value: 0,
+        //   id: 'ruku_month_count'
+        // },
+        {
+          label: '本年度市级调度',
+          value: 0,
+          id: 'yingjidiaodu_count',
+          unit: '次'
+        },
+        {
+          label: '队伍数量',
+          value: 0,
+          id: 'team_count',
+          unit: '个'
+        },
+        {
+          label: '队伍出动人次',
+          value: 0,
+          id: 'team_article_total',
+          unit: '人次'
+        },
+        {
+          label: '正在出动抢险队伍',
+          value: 0,
+          id: 'team_raxing_count',
+          unit: '个'
+        },
+        
+        // {
+        //   label: '装备总数',
+        //   value: 0,
+        //   id: 'shebei_count'
+        // }, {
+        //   label: '盘点',
+        //   value: 0,
+        //   id: 'pan_count'
+        // }, {
+        //   label: '维护',
+        //   value: 0,
+        //   id: 'weihu_count'
+        // },
+      ],
+      bottomObj: [
+        {
           label: '库存管理',
           path: '/views/inventorys'
-        }, {
+        },
+        {
           label: '入库管理',
           path: '/stocks/index_purchase'
-        }, {
+        },
+        {
           label: '出库管理',
           path: '/outbounds/index'
-        }, {
+        },
+        {
           label: '统计报表',
           path: '/reports/stocks'
-        }, {
+        },
+        {
           label: '应急防御',
           path: '/books/index'
-        }, {
+        },
+        {
           label: '盘点管理',
           path: '/inventorys/stocktaking'
-        }, {
+        },
+        {
           label: '运维管理',
           path: '/maintenance/maintenance_records'
-        }, {
+        },
+        {
           label: '应急调令',
           path: '/workOrder/index'
-        }],
-        // 分类
-        activeType: '市级',
-        autoSwitchTimer: null,
-        resumeTimer: null,
-        userInteracted: false,
-        apiData: [],
-        chartDataMap: {},
-        typeList: [],
-        autoTimer: null, // 自动切换定时器
-        resumeTimer: null, // 恢复自动切换的倒计时
-        xData: [],
-        yData: [],
-        todoList: [{
-          id: 'gongdan',
-          value: '调令'
-        }, {
+        }
+      ],
+      // 分类
+      activeType: '市级',
+      autoSwitchTimer: null,
+      resumeTimer: null,
+      userInteracted: false,
+      apiData: [],
+      chartDataMap: {},
+      typeList: [],
+      autoTimer: null, // 自动切换定时器
+      resumeTimer: null, // 恢复自动切换的倒计时
+      xData: [],
+      yData: [],
+      todoList: [
+        {
           id: 'pandian',
           value: '盘点'
-        }, {
+        },
+        {
           id: 'weihu',
           value: '维护'
-        }],
-        imgList: {
-          '袋类': require("@/assets/dailei.jpg"),
-          '排水类': require('@/assets/beng.jpg'),
-          '土工布类': require('@/assets/tugongbu.jpg'),
-          '动力及照明类': require('@/assets/zhaoming.jpg'),
-          '移动泵车': require('@/assets/bengche.jpg'),
-          '桩类': require('@/assets/zhuanglei.jpg'),
-          '砂石类': require('@/assets/shashi.jpg'),
+        }
+      ],
+      finishData:[],
+      finishType: 1,
+      finishTypeList: [
+        {
+          label: '年度',
+          value: 1
+        },
+        {
+          label: '季度',
+          value: 2
         },
+        {
+          label: '月度',
+          value: 3
+        }
+      ],
+      imgList: {
+        袋类: require('@/assets/dailei.jpg'),
+        排水类: require('@/assets/beng.jpg'),
+        土工布类: require('@/assets/tugongbu.jpg'),
+        动力及照明类: require('@/assets/zhaoming.jpg'),
+        移动泵车: require('@/assets/bengche.jpg'),
+        桩类: require('@/assets/zhuanglei.jpg'),
+        砂石类: require('@/assets/shashi.jpg')
       }
+    }
+  },
+  computed: {
+    chartData() {
+      return this.chartDataMap[this.activeType]
     },
-    computed: {
-      chartData() {
-        return this.chartDataMap[this.activeType]
+    chartXData() {
+      // 即使没有数据，也提供默认的X轴标签
+      if (this.finishType === 1) {
+        // 年度：返回当前年份
+        return [new Date().getFullYear().toString()]
+      } else if (this.finishType === 2) {
+        // 季度：返回四个季度
+        return ['第一季度', '第二季度', '第三季度', '第四季度']
+      } else if (this.finishType === 3) {
+        // 月度：返回12个月
+        const months = []
+        for (let i = 1; i <= 12; i++) {
+          months.push(`${new Date().getFullYear()}-${i.toString().padStart(2, '0')}`)
+        }
+        return months
       }
+      return []
     },
-    watch: {
-
+    chartYData() {
+      // 提供默认数据，确保图表能正常显示
+      if (this.finishType === 1) {
+        // 年度：返回盘点和维护数据
+        if (this.finishData && this.finishData.rate) {
+          const rate = this.finishData.rate
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: [rate.pandian || 0],
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: [rate.weihu || 0],
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        } else {
+          // 默认数据
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: [0],
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: [0],
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        }
+      } else if (this.finishType === 2) {
+        // 季度：返回四个季度的盘点和维护数据
+        if (this.finishData && this.finishData.rate) {
+          const rate = this.finishData.rate
+          const pandianData = []
+          const weihuData = []
+          
+          for (let i = 1; i <= 4; i++) {
+            const quarterData = rate[i] || { pandian: 0, weihu: 0 }
+            pandianData.push(quarterData.pandian || 0)
+            weihuData.push(quarterData.weihu || 0)
+          }
+          
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: pandianData,
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: weihuData,
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        } else {
+          // 默认数据
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: [0, 0, 0, 0],
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: [0, 0, 0, 0],
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        }
+      } else if (this.finishType === 3) {
+        // 月度：返回12个月的盘点和维护数据
+        if (this.finishData && this.finishData.rate) {
+          const rate = this.finishData.rate
+          const pandianData = []
+          const weihuData = []
+          
+          for (let i = 1; i <= 12; i++) {
+            const monthKey = `${new Date().getFullYear()}-${i.toString().padStart(2, '0')}`
+            const monthData = rate[monthKey] || { pandian: 0, weihu: 0 }
+            pandianData.push(monthData.pandian || 0)
+            weihuData.push(monthData.weihu || 0)
+          }
+          
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: pandianData,
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: weihuData,
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        } else {
+          // 默认数据
+          const defaultData = Array(12).fill(0)
+          return [
+            {
+              name: '盘点',
+              type: 'bar',
+              data: defaultData,
+              itemStyle: { color: '#6ec6ff' }
+            },
+            {
+              name: '维护',
+              type: 'bar',
+              data: defaultData,
+              itemStyle: { color: '#4be3c1' }
+            }
+          ]
+        }
+      }
+      return []
+    }
+  },
+  watch: {
+    finishData: {
+      handler(newVal) {
+        console.log('finishData 变化:', newVal)
+        console.log('chartXData 更新为:', this.chartXData)
+        console.log('chartYData 更新为:', this.chartYData)
+      },
+      deep: true,
+      immediate: true
     },
-
-    mounted() {
-      this.getChartData()
-      this.$store.dispatch('app/closeSideBar', {
-        withoutAnimation: false
-      })
-      this.setRem()
-
-      this.calculateScreenSize()
-      window.addEventListener('resize', this.calculateScreenSize)
+    finishType: {
+      handler(newVal) {
+        console.log('finishType 变化:', newVal)
+        // 类型变化时重新获取数据
+        this.getFinishData()
+      },
+      immediate: false
+    }
+  },
+
+  mounted() {
+    this.getChartData()
+    
+    // 延迟获取数据，确保组件完全挂载
+    this.$nextTick(() => {
+    this.getFinishData()
+    })
+    
+    // 添加调试信息
+    console.log('组件挂载完成')
+    console.log('初始 finishType:', this.finishType)
+    console.log('初始 chartXData:', this.chartXData)
+    console.log('初始 chartYData:', this.chartYData)
+    
+    this.$store.dispatch('app/closeSideBar', {
+      withoutAnimation: false
+    })
+    this.setRem()
+
+    this.calculateScreenSize()
+    window.addEventListener('resize', this.calculateScreenSize)
+  },
+  beforeRouteLeave(to, from, next) {
+    this.$store.dispatch('app/toggleSideBar')
+    next()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.calculateScreenSize)
+    this.clearAutoSwitch()
+    if (this.resumeTimer) clearTimeout(this.resumeTimer)
+  },
+  methods: {
+    toLeader() {
+      window.open('/admin/#/leader', '_blank')
     },
-    beforeRouteLeave(to, from, next) {
-      this.$store.dispatch('app/toggleSideBar')
-      next()
+    // 自动切换
+    startAutoSwitch() {
+      this.clearAutoSwitch()
+      this.autoSwitchTimer = setInterval(() => {
+        this.activeType = this.activeType === '市级' ? '全市' : '市级'
+      }, 5000)
     },
-    beforeDestroy() {
-      window.removeEventListener('resize', this.calculateScreenSize)
-      this.clearAutoSwitch();
-      if (this.resumeTimer) clearTimeout(this.resumeTimer);
+    // 停止自动切换
+    clearAutoSwitch() {
+      if (this.autoSwitchTimer) {
+        clearInterval(this.autoSwitchTimer)
+        this.autoSwitchTimer = null
+      }
     },
-    methods: {
-      toLeader(){
-        window.open("/admin/#/leader",'_blank')
-      },
-      // 自动切换
-      startAutoSwitch() {
-        this.clearAutoSwitch();
-        this.autoSwitchTimer = setInterval(() => {
-          this.activeType = this.activeType === '市级' ? '全市' : '市级';
-        }, 5000);
-      },
-      // 停止自动切换
-      clearAutoSwitch() {
-        if (this.autoSwitchTimer) {
-          clearInterval(this.autoSwitchTimer);
-          this.autoSwitchTimer = null;
+    // 用户点击切换
+    onTypeClick(type) {
+      if (this.activeType !== type) {
+        this.activeType = type
+      }
+      this.clearAutoSwitch()
+      this.userInteracted = true
+      // 10秒后恢复自动切换
+      if (this.resumeTimer) clearTimeout(this.resumeTimer)
+      this.resumeTimer = setTimeout(() => {
+        this.userInteracted = false
+        this.startAutoSwitch()
+      }, 10000)
+    },
+    // 获取统计数据
+    // 获取已办任务
+    async getFinishData() {
+      try {
+      const res = await finishCharts({
+          type: this.finishType
+      })
+        console.log('getFinishData 响应:', res)
+        
+        if (res && res.data) {
+      this.finishData = res.data
+          console.log('设置 finishData:', this.finishData)
+        } else {
+          console.warn('getFinishData 返回数据为空，使用模拟数据')
+          // 使用模拟数据进行测试
+          this.finishData = this.getMockData()
         }
-      },
-      // 用户点击切换
-      onTypeClick(type) {
-        if (this.activeType !== type) {
-          this.activeType = type;
+      } catch (error) {
+        console.error('getFinishData 调用失败:', error)
+        // 使用模拟数据，确保图表能显示
+        this.finishData = this.getMockData()
+      }
+      
+      // 强制更新计算属性
+      this.$forceUpdate()
+    },
+    
+    // 获取模拟数据用于测试
+    getMockData() {
+      if (this.finishType === 1) {
+        // 年度模拟数据
+        return {
+          rate: {
+            pandian: 96,
+            weihu: 1
+          }
         }
-        this.clearAutoSwitch();
-        this.userInteracted = true;
-        // 10秒后恢复自动切换
-        if (this.resumeTimer) clearTimeout(this.resumeTimer);
-        this.resumeTimer = setTimeout(() => {
-          this.userInteracted = false;
-          this.startAutoSwitch();
-        }, 10000);
-      },
-      // 获取统计数据
-      async getChartData() {
-        const res = await fenleiCharts()
-        const home = await homeCharts()
-        // 顶部数据
-        this.topObj.map(item => {
-          item.value = home.top[item.id]
-        })
-
-        this.xData = []
-
-        this.yData = []
-        this.todoList.map(item => {
-          this.xData.push(item.value)
-          this.yData.push(home.rate[item.id])
-        })
-        console.log(this.xData, this.yData)
-        res.upList.map(item => {
-          item.img = this.imgList[item.name]
-        })
-        this.upList = this.mergeAndRename(res.upList)
+      } else if (this.finishType === 2) {
+        // 季度模拟数据
+        return {
+          rate: {
+            "1": { pandian: 0, weihu: 0, total: 0 },
+            "2": { pandian: 96, weihu: 0, total: 96 },
+            "3": { pandian: 0, weihu: 1, total: 1 },
+            "4": { pandian: 0, weihu: 0, total: 0 }
+          }
+        }
+      } else if (this.finishType === 3) {
+        // 月度模拟数据
+        const rate = {}
+        for (let i = 1; i <= 12; i++) {
+          const monthKey = `${new Date().getFullYear()}-${i.toString().padStart(2, '0')}`
+          if (i === 6) {
+            rate[monthKey] = { pandian: 96, weihu: 0, total: 96 }
+          } else if (i === 7) {
+            rate[monthKey] = { pandian: 0, weihu: 1, total: 1 }
+          } else {
+            rate[monthKey] = { pandian: 0, weihu: 0, total: 0 }
+          }
+        }
+        return { rate }
+      }
+      
+      return { rate: {} }
+    },
+    async getChartData() {
+      const res = await fenleiCharts()
+      const home = await homeCharts()
+      // 顶部数据
+      this.topObj.map(item => {
+        item.value = home.top[item.id]
+      })
 
-        res.upListByFloodMaterials.map(item => {
-          item.img = this.imgList[item.name]
-        })
-        this.upListByFloodMaterials = this.mergeAndRename(res.upListByFloodMaterials)
-        this.startAutoSwitch();
-      },
-      mergeAndRename(arr) {
-        const resultMap = new Map();
-        let pumpTotal = 0; // 排水类总和
-        let mobilePumpTotal = 0; // 移动泵车总和
-        let pumpUnit = ""; // 排水类的单位
-        let pumpImg = this.imgList['排水类']
-        // 第一步：遍历数组，处理常规项并统计特殊项
-        arr.forEach(item => {
-          const {
-            name,
-            total,
-            unit,
-            img
-          } = item;
-          const value = total;
+      this.xData = []
 
-          if (name === "排水类") {
-            pumpTotal += value;
-            // 记录排水类的unit（假设所有排水类unit相同）
-            if (!pumpUnit) pumpUnit = unit;
+      this.yData = []
+      this.todoList.map(item => {
+        // this.xData.push(item.value)
+        // this.yData.push(home.rate[item.id])
+      })
+      console.log(this.xData, this.yData)
+      res.upList.map(item => {
+        item.img = this.imgList[item.name]
+      })
+      this.upList = this.mergeAndRename(res.upList)
 
-          } else if (name === "移动泵车") {
-            mobilePumpTotal += value;
-            // 正常处理移动泵车，加入结果集
-            if (resultMap.has(name)) {
-              resultMap.get(name).value += value;
-            } else {
-              resultMap.set(name, {
-                name,
-                value,
-                unit,
-                img
-              });
-            }
+      res.upListByFloodMaterials.map(item => {
+        item.img = this.imgList[item.name]
+      })
+      this.upListByFloodMaterials = this.mergeAndRename(res.upListByFloodMaterials)
+      this.startAutoSwitch()
+    },
+    mergeAndRename(arr) {
+      const resultMap = new Map()
+      let pumpTotal = 0 // 排水类总和
+      let mobilePumpTotal = 0 // 移动泵车总和
+      let pumpUnit = '' // 排水类的单位
+      let pumpImg = this.imgList['排水类']
+      // 第一步：遍历数组，处理常规项并统计特殊项
+      arr.forEach(item => {
+        const { name, total, unit, img } = item
+        const value = total
+
+        if (name === '排水类') {
+          pumpTotal += value
+          // 记录排水类的unit（假设所有排水类unit相同）
+          if (!pumpUnit) pumpUnit = unit
+        } else if (name === '移动泵车') {
+          mobilePumpTotal += value
+          // 正常处理移动泵车，加入结果集
+          if (resultMap.has(name)) {
+            resultMap.get(name).value += value
           } else {
-            // 常规项处理
-            if (resultMap.has(name)) {
-              resultMap.get(name).value += value;
-            } else {
-              resultMap.set(name, {
-                name,
-                value,
-                unit,
-                img
-              });
-            }
+            resultMap.set(name, {
+              name,
+              value,
+              unit,
+              img
+            })
+          }
+        } else {
+          // 常规项处理
+          if (resultMap.has(name)) {
+            resultMap.get(name).value += value
+          } else {
+            resultMap.set(name, {
+              name,
+              value,
+              unit,
+              img
+            })
           }
-        });
-
-        // 第二步：计算泵类值并添加到结果集
-        if (pumpTotal > 0) {
-          const finalPumpValue = pumpTotal - mobilePumpTotal;
-          resultMap.set("泵", {
-            name: "泵",
-            value: finalPumpValue,
-            unit: pumpUnit,
-            img: pumpImg
-          });
         }
+      })
 
-        return Array.from(resultMap.values());
-      },
+      // 第二步：计算泵类值并添加到结果集
+      if (pumpTotal > 0) {
+        const finalPumpValue = pumpTotal - mobilePumpTotal
+        resultMap.set('泵', {
+          name: '泵',
+          value: finalPumpValue,
+          unit: pumpUnit,
+          img: pumpImg
+        })
+      }
 
-      setRem() {
-        // 默认使用100px作为基准大小
-        const baseSize = 100
-        const baseVal = baseSize / 1920
-        const vW = window.innerWidth // 当前窗口的宽度
-        const rem = vW * baseVal // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应font-size值
-        window.$size = rem / 100
-        document.documentElement.style.fontSize = rem + 'px'
-      },
-      calculateScreenSize() {
-        this.screenWidth = window.innerWidth
-        this.screenHeight = window.innerHeight
-        this.bgStyle = {
-          width: this.screenWidth - 56 + 'px',
-          height: this.screenHeight + 'px',
-          position: 'relative',
-          left: '-20px'
-          // top:'-60px'
-        }
-        this.contentStyle = {
-          width: this.screenWidth - 70 + 'px',
-          height: this.screenHeight - 20 + 'px'
-        }
-      },
-      toUrl(path) {
-        this.$router.push(path)
+      return Array.from(resultMap.values())
+    },
+
+    setRem() {
+      // 默认使用100px作为基准大小
+      const baseSize = 100
+      const baseVal = baseSize / 1920
+      const vW = window.innerWidth // 当前窗口的宽度
+      const rem = vW * baseVal // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应font-size值
+      window.$size = rem / 100
+      document.documentElement.style.fontSize = rem + 'px'
+    },
+    calculateScreenSize() {
+      this.screenWidth = window.innerWidth
+      this.screenHeight = window.innerHeight
+      this.bgStyle = {
+        width: this.screenWidth - 56 + 'px',
+        height: this.screenHeight + 'px',
+        position: 'relative',
+        left: '-20px'
+        // top:'-60px'
+      }
+      this.contentStyle = {
+        width: this.screenWidth - 70 + 'px',
+        height: this.screenHeight - 20 + 'px'
       }
+    },
+    toUrl(path) {
+      this.$router.push(path)
+    },
+    onTimeTypeChange(type) {
+      this.finishType = type
+      this.getFinishData()
     }
-
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep .app-main {
-    padding: 0 !important
+::v-deep .app-main {
+  padding: 0 !important;
+}
+
+.jsc {
+  height: 100%;
+  background: url(../../assets/jsc/bg.png) no-repeat center top;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 10px;
+  padding-top: 0;
+  &-view {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    border-radius: 12px;
+    padding: 5px 15px;
+    font-size: 14px;
+    color: #fff;
+    text-align: center;
+    background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
+    box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
   }
-
-  .jsc {
+  .jscC {
+    width: 100%;
     height: 100%;
-    background: url(../../assets/jsc/bg.png) no-repeat center top;
+    background: url(../../assets/jsc/contentBg.png) no-repeat center top;
     background-size: 100% 100%;
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 10px;
-    padding-top: 0;
-    &-view{
-      position: absolute;
-      top:20px;
-      right:20px;
-      border-radius: 12px;
-      padding: 5px 15px;
-      font-size: 14px;
-      color:#fff;
-      text-align: center;
-      background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
-      box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
-    }
-    .jscC {
-      width: 100%;
-      height: 100%;
-      background: url(../../assets/jsc/contentBg.png) no-repeat center top;
+    flex-wrap: wrap;
+    padding-top: 0.7rem;
+
+    &-top {
+      width: 17.67rem;
+      height: 1.52rem;
+      padding: 0 0.4rem;
+      // height: 100%;
+      background: url(../../assets/jsc/topbg.png) no-repeat center top;
       background-size: 100% 100%;
       display: flex;
       align-items: center;
-      justify-content: center;
-      flex-wrap: wrap;
-      padding-top: .7rem;
+      justify-content: space-between;
 
-      &-top {
-        width: 17.67rem;
-        height: 1.52rem;
-        padding: 0 .4rem;
-        // height: 100%;
-        background: url(../../assets/jsc/topbg.png) no-repeat center top;
-        background-size: 100% 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+      .label {
+        font-size: 0.2rem;
+        text-align: center;
+        color: #fff;
+      }
 
-        .label {
-          font-size: .2rem;
-          text-align: center;
-          color: #fff;
-        }
+      .value {
+        font-size: 0.38rem;
+        text-align: center;
+        color: #7ff7fe;
+        font-weight: bolder;
+      }
+    }
+
+    &-center {
+      width: 17.67rem;
+      // height: 1.52rem;
+      padding: 0 0.2rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
 
-        .value {
-          font-size: .38rem;
+      // flex-wrap: wrap;
+      &-left {
+        // height: 400px;
+        &-title {
+          color: #6dcde6;
           text-align: center;
-          color: #7ff7fe;
-          font-weight: bolder;
-        }
-      }
+          font-weight: bold;
+          margin-bottom: 10px;
+          font-size: 16px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
 
-      &-center {
-        width: 17.67rem;
-        // height: 1.52rem;
-        padding: 0 .2rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+          & > div {
+            margin-left: 15px;
+          }
+        }
 
-        // flex-wrap: wrap;
-        &-left {
+        &-content {
+          width: 450px;
+          display: flex;
+          flex-wrap: wrap;
 
-          // height: 400px;
-          &-title {
-            color: #6dcde6;
-            text-align: center;
-            font-weight: bold;
-            margin-bottom: 10px;
+          & > div {
+            flex-basis: 50%;
+            text-align: left;
+            margin: 10px 0;
+            color: #fff;
             font-size: 16px;
             display: flex;
             align-items: center;
-            justify-content: center;
 
-            &>div {
-              margin-left: 15px;
-            }
-          }
-
-          &-content {
-            width: 450px;
-            display: flex;
-            flex-wrap: wrap;
-
-            &>div {
-              flex-basis: 50%;
-              text-align: left;
-              margin: 10px 0;
-              color: #fff;
-              font-size: 16px;
-              display: flex;
-              align-items: center;
-
-              &>img {
-                width: 30px;
-                height: 30px;
-                margin-right: 10px;
-              }
+            & > img {
+              width: 30px;
+              height: 30px;
+              margin-right: 10px;
             }
           }
-
-          .custom-btn {
-            background: #0b1b3a;
-            color: #19eaff;
-            border: none;
-            border-radius: 12px;
-            padding: 5px 15px;
-            font-size: 14px;
-            cursor: pointer;
-            transition: background 0.2s, color 0.2s;
-            margin-right: 15px;
-          }
-
-          .custom-btn.active {
-            background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
-            color: #fff;
-            box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
-          }
         }
 
-        &-center {
-          width: 10.3rem;
+        .custom-btn {
+          background: #0b1b3a;
+          color: #19eaff;
+          border: none;
+          border-radius: 12px;
+          padding: 5px 15px;
+          font-size: 14px;
+          cursor: pointer;
+          transition: background 0.2s, color 0.2s;
+          margin-right: 15px;
         }
 
-        &-right {}
+        .custom-btn.active {
+          background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
+          color: #fff;
+          box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
+        }
       }
 
-      &-bottom {
-        font-size: .22rem;
-        color: #fff;
-        width: 17.67rem;
-        padding: .2rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+      &-center {
+        width: 10.3rem;
+      }
 
-        &>div {
-          width: 1.57rem;
-          height: 1.57rem;
-          background: url(../../assets/jsc/icon.png) no-repeat center top;
-          background-size: 100% 100%;
+      &-right {
+        .chart-header {
+          margin-bottom: 15px;
           display: flex;
           align-items: center;
           justify-content: center;
-          cursor: pointer;
+          gap: 20px;
+          
+          .chart-title {
+            color: #6dcde6;
+            font-size: 16px;
+            font-weight: bold;
+            margin-bottom: 0; // 移除底部边距
+          }
+          
+          .time-tabs {
+            display: flex;
+            gap: 10px;
+            
+            .time-tab {
+              background: #0b1b3a;
+              color: #19eaff;
+              border: none;
+              border-radius: 12px;
+              padding: 5px 15px;
+              font-size: 14px;
+              cursor: pointer;
+              transition: background 0.2s, color 0.2s;
+              
+              &:hover {
+                background: #1a2b4a;
+              }
+              
+              &.active {
+                background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
+                color: #fff;
+                box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
+              }
+            }
+          }
         }
       }
     }
+
+    &-bottom {
+      font-size: 0.22rem;
+      color: #fff;
+      width: 17.67rem;
+      padding: 0.2rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      & > div {
+        width: 1.57rem;
+        height: 1.57rem;
+        background: url(../../assets/jsc/icon.png) no-repeat center top;
+        background-size: 100% 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+      }
+    }
   }
-</style>
+}
+</style>
diff --git a/src/views/jsc/leader.vue b/src/views/jsc/leader.vue
index 4193873..f95fed1 100644
--- a/src/views/jsc/leader.vue
+++ b/src/views/jsc/leader.vue
@@ -1,492 +1,988 @@
-<template>
-  <div class="jsc" :style="bgStyle">
-    <div class="jscC">
-      <div class="jscC-top">
-        <div v-for="item in topObj">
-          <div class="label">{{ item.label }}</div>
-          <div class="value">
-            {{ item.value }} <span style="font-size: 0.2rem;">{{item.unit?item.unit:''}}</span>
-            <!-- <CountUp :end="item.value" :duration="6" ref="count" /> -->
-          </div>
-        </div>
-      </div>
-      <div class="jscC-center">
-        <div class="jscC-center-left">
-          <div class="jscC-center-top">
-            <div class="jscC-center-left-title">年度物资动态</div>
-            <WarehouseTable></WarehouseTable>
-          </div>
-          <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
-          <div class="jscC-center-left-title">
-            <span>重要防汛物资</span>
-            <div>
-              <span :class="['custom-btn', { active: activeType === '市级' }]" @click="onTypeClick('市级')">市级</span>
-              <span :class="['custom-btn', { active: activeType === '全市' }]" @click="onTypeClick('全市')">全市</span>
-            </div>
-          </div>
-          <div class="jscC-center-left-content">
-            <div v-if="activeType === '市级'" v-for="item in upList">
-              <img :src="item.img" alt="">
-              <span>{{item.name}}：</span>
-              <span>{{item.value}}{{item.unit?item.unit:''}}</span>
-            </div>
-
-            <div v-if="activeType === '全市'" v-for="item in upListByFloodMaterials">
-              <img :src="item.img" alt="">
-              <span>{{item.name}}：</span>
-              <span>{{item.value}}{{item.unit?item.unit:''}}</span>
-            </div>
-          </div>
-        </div>
-        <div class="jscC-center-center">
-          <echartsMap :mapStyle="'width:900px;height:650px;position: relative;'" ref="echartsMap" />
-
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import Bar3DChart from '../jsc/components/barChart.vue'
-  import echartsMap from './components/mapChart.vue'
-  import WarehouseTable from './components/WarehouseTable.vue'
-
-  import {
-    fenleiCharts,
-    homeCharts,
-
-  } from '@/api/charts.js'
-  export default {
-    components: {
-      Bar3DChart,
-      echartsMap,
-      WarehouseTable
-    },
-    data() {
-      return {
-        screenWidth: 0,
-        screenHeight: 0,
-        bgStyle: {
-          width: 0,
-          height: 0
-        },
-        contentStyle: {
-          width: 0,
-          height: 0
-        },
-        upList: [],
-        upListByFloodMaterials: [],
-        topObj: [{
-            label: '仓库数量',
-            value: 0,
-            id: 'cangku_count',
-            unit: '个'
-          }, {
-            label: '物资种类',
-            value: 0,
-            id: 'wuzizhonglei_count',
-            unit: '类'
-          },
-          // {
-          //   label: '本月出库',
-          //   value: 0,
-          //   id: 'chuku_month_count'
-          // }, {
-          //   label: '本月入库',
-          //   value: 0,
-          //   id: 'ruku_month_count'
-          // },
-          {
-            label: '本年度市级调度',
-            value: 0,
-            id: 'yingjidiaodu_count',
-            unit: '次'
-          }, {
-            label: '队伍数量',
-            value: 0,
-            id: 'team_count',
-            unit: '个'
-          }, {
-            label: '队伍出动人次',
-            value: 0,
-            id: 'team_article_total',
-            unit: '人次'
-          }
-          // {
-          //   label: '装备总数',
-          //   value: 0,
-          //   id: 'shebei_count'
-          // }, {
-          //   label: '盘点',
-          //   value: 0,
-          //   id: 'pan_count'
-          // }, {
-          //   label: '维护',
-          //   value: 0,
-          //   id: 'weihu_count'
-          // },
-        ],
-        // 分类
-        activeType: '市级',
-        autoSwitchTimer: null,
-        resumeTimer: null,
-        userInteracted: false,
-        apiData: [],
-        chartDataMap: {},
-        typeList: [],
-        autoTimer: null, // 自动切换定时器
-        resumeTimer: null, // 恢复自动切换的倒计时
-        xData: [],
-        yData: [],
-        todoList: [{
-          id: 'gongdan',
-          value: '调令'
-        }, {
-          id: 'pandian',
-          value: '盘点'
-        }, {
-          id: 'weihu',
-          value: '维护'
-        }],
-        imgList: {
-          '袋类': require("@/assets/dailei.jpg"),
-          '排水类': require('@/assets/beng.jpg'),
-          '土工布类': require('@/assets/tugongbu.jpg'),
-          '动力及照明类': require('@/assets/zhaoming.jpg'),
-          '移动泵车': require('@/assets/bengche.jpg'),
-          '桩类': require('@/assets/zhuanglei.jpg'),
-          '砂石类': require('@/assets/shashi.jpg'),
-        },
-      }
-    },
-    computed: {
-      chartData() {
-        return this.chartDataMap[this.activeType]
-      }
-    },
-    watch: {
-
-    },
-
-    mounted() {
-      this.getChartData()
-      this.$store.dispatch('app/closeSideBar', {
-        withoutAnimation: false
-      })
-      this.setRem()
-
-      this.calculateScreenSize()
-      window.addEventListener('resize', this.calculateScreenSize)
-    },
-    beforeRouteLeave(to, from, next) {
-      this.$store.dispatch('app/toggleSideBar')
-      next()
-    },
-    beforeDestroy() {
-      window.removeEventListener('resize', this.calculateScreenSize)
-      this.clearAutoSwitch();
-      if (this.resumeTimer) clearTimeout(this.resumeTimer);
-    },
-    methods: {
-      // 自动切换
-      startAutoSwitch() {
-        this.clearAutoSwitch();
-        this.autoSwitchTimer = setInterval(() => {
-          this.activeType = this.activeType === '市级' ? '全市' : '市级';
-        }, 5000);
-      },
-      // 停止自动切换
-      clearAutoSwitch() {
-        if (this.autoSwitchTimer) {
-          clearInterval(this.autoSwitchTimer);
-          this.autoSwitchTimer = null;
-        }
-      },
-      // 用户点击切换
-      onTypeClick(type) {
-        if (this.activeType !== type) {
-          this.activeType = type;
-        }
-        this.clearAutoSwitch();
-        this.userInteracted = true;
-        // 10秒后恢复自动切换
-        if (this.resumeTimer) clearTimeout(this.resumeTimer);
-        this.resumeTimer = setTimeout(() => {
-          this.userInteracted = false;
-          this.startAutoSwitch();
-        }, 10000);
-      },
-      // 获取统计数据
-      async getChartData() {
-        const res = await fenleiCharts()
-        const home = await homeCharts()
-        // 顶部数据
-        this.topObj.map(item => {
-          item.value = home.top[item.id]
-        })
-
-        this.xData = []
-
-        this.yData = []
-        this.todoList.map(item => {
-          this.xData.push(item.value)
-          this.yData.push(home.rate[item.id])
-        })
-        console.log(this.xData, this.yData)
-        res.upList.map(item => {
-          item.img = this.imgList[item.name]
-        })
-        this.upList = this.mergeAndRename(res.upList)
-
-        res.upListByFloodMaterials.map(item => {
-          item.img = this.imgList[item.name]
-        })
-        this.upListByFloodMaterials = this.mergeAndRename(res.upListByFloodMaterials)
-        this.startAutoSwitch();
-      },
-      mergeAndRename(arr) {
-        const resultMap = new Map();
-        let pumpTotal = 0; // 排水类总和
-        let mobilePumpTotal = 0; // 移动泵车总和
-        let pumpUnit = ""; // 排水类的单位
-        let pumpImg = this.imgList['排水类']
-        // 第一步：遍历数组，处理常规项并统计特殊项
-        arr.forEach(item => {
-          const {
-            name,
-            total,
-            unit,
-            img
-          } = item;
-          const value = total;
-
-          if (name === "排水类") {
-            pumpTotal += value;
-            // 记录排水类的unit（假设所有排水类unit相同）
-            if (!pumpUnit) pumpUnit = unit;
-
-          } else if (name === "移动泵车") {
-            mobilePumpTotal += value;
-            // 正常处理移动泵车，加入结果集
-            if (resultMap.has(name)) {
-              resultMap.get(name).value += value;
-            } else {
-              resultMap.set(name, {
-                name,
-                value,
-                unit,
-                img
-              });
-            }
-          } else {
-            // 常规项处理
-            if (resultMap.has(name)) {
-              resultMap.get(name).value += value;
-            } else {
-              resultMap.set(name, {
-                name,
-                value,
-                unit,
-                img
-              });
-            }
-          }
-        });
-
-        // 第二步：计算泵类值并添加到结果集
-        if (pumpTotal > 0) {
-          const finalPumpValue = pumpTotal - mobilePumpTotal;
-          resultMap.set("泵", {
-            name: "泵",
-            value: finalPumpValue,
-            unit: pumpUnit,
-            img: pumpImg
-          });
-        }
-
-        return Array.from(resultMap.values());
-      },
-
-      setRem() {
-        // 默认使用100px作为基准大小
-        const baseSize = 100
-        const baseVal = baseSize / 1920
-        const vW = window.innerWidth // 当前窗口的宽度
-        const rem = vW * baseVal // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应font-size值
-        window.$size = rem / 100
-        document.documentElement.style.fontSize = rem + 'px'
-      },
-      calculateScreenSize() {
-        this.screenWidth = window.innerWidth
-        this.screenHeight = window.innerHeight
-        this.bgStyle = {
-          width: this.screenWidth  + 'px',
-          height: this.screenHeight + 'px',
-          position: 'relative',
-          left: '0px'
-          // top:'-60px'
-        }
-        this.contentStyle = {
-          width: this.screenWidth + 'px',
-          height: this.screenHeight + 'px'
-        }
-      },
-      toUrl(path) {
-        this.$router.push(path)
-      }
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  ::v-deep .app-main {
-    padding: 0 !important
-  }
-
-  .jsc {
-    height: 100%;
-    // background: url(../../assets/jsc/bg.png) no-repeat center top;
-    background: #05296f;
-    background-size: 100% 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 10px;
-    padding-top: 0;
-
-    .jscC {
-      width: 100%;
-      height: 100%;
-      background: url(../../assets/jsc/contentBg.png) no-repeat center top;
-      background-size: 100% 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-wrap: wrap;
-      padding-top: .7rem;
-
-      &-top {
-        width: 17.67rem;
-        height: 1.52rem;
-        padding: 0 .4rem;
-        // height: 100%;
-        background: url(../../assets/jsc/topbg.png) no-repeat center top;
-        background-size: 100% 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .label {
-          font-size: .2rem;
-          text-align: center;
-          color: #fff;
-        }
-
-        .value {
-          font-size: .38rem;
-          text-align: center;
-          color: #7ff7fe;
-          font-weight: bolder;
-        }
-      }
-
-      &-center {
-        width: 17.67rem;
-        // height: 1.52rem;
-        padding: 0 .2rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        // flex-wrap: wrap;
-        &-left {
-
-          // height: 400px;
-          &-title {
-            color: #6dcde6;
-            text-align: center;
-            font-weight: bold;
-            margin-bottom: 10px;
-            font-size: 16px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-
-            &>div {
-              margin-left: 15px;
-            }
-          }
-
-          &-content {
-            width: 450px;
-            display: flex;
-            flex-wrap: wrap;
-
-            &>div {
-              flex-basis: 50%;
-              text-align: left;
-              margin: 10px 0;
-              color: #fff;
-              font-size: 16px;
-              display: flex;
-              align-items: center;
-
-              &>img {
-                width: 30px;
-                height: 30px;
-                margin-right: 10px;
-              }
-            }
-          }
-
-          .custom-btn {
-            background: #0b1b3a;
-            color: #19eaff;
-            border: none;
-            border-radius: 12px;
-            padding: 5px 15px;
-            font-size: 14px;
-            cursor: pointer;
-            transition: background 0.2s, color 0.2s;
-            margin-right: 15px;
-          }
-
-          .custom-btn.active {
-            background: linear-gradient(90deg, #3ad0ff 0%, #4be3c1 100%);
-            color: #fff;
-            box-shadow: 0 2px 12px 0 rgba(58, 208, 255, 0.2);
-          }
-        }
-
-        &-center {
-          width: 10.3rem;
-        }
-
-        &-right {}
-      }
-
-      &-bottom {
-        font-size: .22rem;
-        color: #fff;
-        width: 17.67rem;
-        padding: .2rem;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        &>div {
-          width: 1.57rem;
-          height: 1.57rem;
-          background: url(../../assets/jsc/icon.png) no-repeat center top;
-          background-size: 100% 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          cursor: pointer;
-        }
-      }
-    }
-  }
+<template>
+  <div class="jsc" :style="bgStyle">
+    <div class="jscC">
+      <div class="jscC-center">
+        <div class="jscC-center-left">
+          <div class="jscC-center-left-top">
+            <div class="stats-cards">
+              <div class="stat-card" v-for="item in topObj.slice(0, 3)" :key="item.id">
+                <div class="stat-icon">
+                  <img :src="item.img" alt="" />
+                </div>
+                <div class="stat-content">
+                  <div class="stat-label">{{ item.label }}</div>
+                  <div class="stat-value">{{ item.value }}{{ item.unit }}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="jscC-center-left-materials">
+            <div class="jscC-center-left-title">
+              <img :src="titleIcon" alt="" class="title-icon" />
+              <span>重点防汛物资统计</span>
+            </div>
+            <div class="jscC-center-left-content">
+              <div v-for="item in upList" :key="item.name">
+                <!-- 四个角的三角形 -->
+                <div class="corner top-left"></div>
+                <div class="corner top-right"></div>
+                <div class="corner bottom-left"></div>
+                <div class="corner bottom-right"></div>
+                <img :src="item.img" alt="" />
+                <div class="item-info">
+                  <span>{{ item.name }}：</span>
+                  <span>{{ item.value }}{{ item.unit ? item.unit : '' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="jscC-center-center">
+          <echartsMap ref="echartsMap" :mapStyle="'width:100%;height:100%;position: relative;'" />
+        </div>
+        <div class="jscC-center-right">
+          <div class="jscC-center-right-top">
+            <div class="section-title">
+              <img :src="titleIcon" alt="" class="title-icon" />
+              <span>各地重点防汛物资</span>
+            </div>
+            <div class="area-selector">
+              <i class="el-icon-arrow-left"></i>
+              <div class="area-list">
+                <span
+                  class="area-item"
+                  v-for="area in areaList"
+                  :key="area.id"
+                  :class="{ active: currentArea === area.id }"
+                  @click="selectArea(area.id)"
+                >
+                  {{ area.name }}
+                </span>
+              </div>
+              <i class="el-icon-arrow-right"></i>
+            </div>
+            <div class="materials-grid">
+              <div class="material-item" v-for="item in areaMaterials" :key="item.name">
+                <!-- 四个角的三角形 -->
+                <div class="corner top-left"></div>
+                <div class="corner top-right"></div>
+                <div class="corner bottom-left"></div>
+                <div class="corner bottom-right"></div>
+                <img :src="item.img" alt="" />
+                <div class="item-info">
+                  <span class="material-name">{{ item.name }}</span>
+                  <span class="material-value">{{ item.value }}{{ item.unit }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="jscC-center-right-bottom">
+            <div class="section-title">
+              <img :src="titleIcon" alt="" class="title-icon" />
+              <span>各地队伍数量</span>
+            </div>
+            <div class="teams-chart">
+              <div class="team-item" v-for="team in teamsList" :key="team.name">
+                <span class="team-name">{{ team.name }}</span>
+                <div class="team-bar">
+                  <div class="bar-fill" :style="{ width: getBarWidth(team.value) }"></div>
+                </div>
+                <span class="team-value">{{ team.value }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Bar3DChart from '../jsc/components/barChart.vue'
+import echartsMap from './components/mapChart.vue'
+import WarehouseTable from './components/WarehouseTable.vue'
+
+import { fenleiCharts, homeCharts } from '@/api/charts.js'
+export default {
+  components: {
+    Bar3DChart,
+    echartsMap,
+    WarehouseTable
+  },
+  data() {
+    return {
+      screenWidth: 0,
+      screenHeight: 0,
+      bgStyle: {
+        width: 0,
+        height: 0
+      },
+      contentStyle: {
+        width: 0,
+        height: 0
+      },
+      upList: [],
+      upListByFloodMaterials: [],
+      currentArea: '',
+      areaList: [],
+      areaMaterials: [],
+      teamsList: [],
+      topObj: [
+        {
+          label: '仓库数量',
+          value: 0,
+          id: 'cangku_count',
+          unit: '个',
+          img: require('@/assets/leader1.png')
+        },
+        {
+          label: '物资种类',
+          value: 0,
+          id: 'wuzizhonglei_count',
+          unit: '类',
+          img: require('@/assets/leader2.png')
+        },
+        {
+          label: '队伍数量',
+          value: 0,
+          id: 'team_count',
+          unit: '个',
+          img: require('@/assets/leader3.png')
+        }
+      ],
+      // 分类
+      apiData: [],
+      chartDataMap: {},
+      typeList: [],
+      imgList: {
+        袋类: require('@/assets/dailei.jpg'),
+        排水类: require('@/assets/beng.jpg'),
+        土工布类: require('@/assets/tugongbu.jpg'),
+        动力及照明类: require('@/assets/zhaoming.jpg'),
+        移动泵车: require('@/assets/bengche.jpg'),
+        桩类: require('@/assets/zhuanglei.jpg'),
+        砂石类: require('@/assets/shashi.jpg')
+      },
+      titleIcon: require('@/assets/leader0.png')
+    }
+  },
+  computed: {
+    chartData() {
+      return this.chartDataMap[this.activeType]
+    }
+  },
+  watch: {},
+
+  mounted() {
+    this.getChartData()
+    this.$store.dispatch('app/closeSideBar', {
+      withoutAnimation: false
+    })
+    this.setRem()
+
+    this.calculateScreenSize()
+    window.addEventListener('resize', this.calculateScreenSize)
+
+    // 初始化区域物资数据
+    this.getAreaMaterials(this.currentArea)
+    
+    // 监听地图容器尺寸变化
+    this.$nextTick(() => {
+      if (this.$refs.echartsMap) {
+        this.$refs.echartsMap.resetCharts()
+      }
+    })
+  },
+  beforeRouteLeave(to, from, next) {
+    this.$store.dispatch('app/toggleSideBar')
+    next()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.calculateScreenSize)
+    this.clearAutoSwitch()
+    if (this.resumeTimer) clearTimeout(this.resumeTimer)
+  },
+  methods: {
+    // 获取统计数据
+    async getChartData() {
+      const res = await fenleiCharts()
+      const home = await homeCharts()
+      // 顶部数据
+      this.topObj.map(item => {
+        item.value = home.top[item.id]
+      })
+
+      this.xData = []
+
+      this.yData = []
+      // this.todoList.map(item => {
+      //   this.xData.push(item.value)
+      //   this.yData.push(home.rate[item.id])
+      // })
+      console.log(this.xData, this.yData)
+      res.upList.map(item => {
+        item.img = this.imgList[item.name]
+      })
+      this.upList = this.mergeAndRename(res.upList)
+
+      res.upListByFloodMaterials.map(item => {
+        item.img = this.imgList[item.name]
+      })
+      this.upListByFloodMaterials = this.mergeAndRename(res.upListByFloodMaterials)
+
+      // 处理队伍数量数据
+      if (home.teamArea && Array.isArray(home.teamArea)) {
+        this.teamsList = home.teamArea
+          .map(item => ({
+            name: item.value,
+            value: item.team_total
+          }))
+          .sort((a, b) => b.value - a.value) // 按team_total从大到小排序
+
+        // 处理各地重点防汛物资数据
+        this.areaList = home.teamArea.map(item => ({
+          id: item.value,
+          name: item.value,
+          floodMaterials: item.floodMaterials || []
+        }))
+
+        // 初始化第一个区域的物资数据
+        if (this.areaList.length > 0) {
+          this.currentArea = this.areaList[0].id
+          this.getAreaMaterials(this.currentArea)
+        }
+
+        // 处理仓库数量数据，传递给地图组件
+        const warehouseData = home.teamArea.map(item => ({
+          name: item.value,
+          warehouseCount: item.materialstorages_total || 0
+        }))
+
+        // 通过ref调用地图组件的方法更新数据
+        this.$nextTick(() => {
+          if (this.$refs.echartsMap && this.$refs.echartsMap.updateWarehouseData) {
+            this.$refs.echartsMap.updateWarehouseData(warehouseData)
+          }
+        })
+      }
+    },
+    mergeAndRename(arr) {
+      const resultMap = new Map()
+      let pumpTotal = 0 // 排水类总和
+      let mobilePumpTotal = 0 // 移动泵车总和
+      let pumpUnit = '' // 排水类的单位
+      let pumpImg = this.imgList['排水类']
+      // 第一步：遍历数组，处理常规项并统计特殊项
+      arr.forEach(item => {
+        const { name, total, unit, img } = item
+        const value = total
+
+        if (name === '排水类') {
+          pumpTotal += value
+          // 记录排水类的unit（假设所有排水类unit相同）
+          if (!pumpUnit) pumpUnit = unit
+        } else if (name === '移动泵车') {
+          mobilePumpTotal += value
+          // 正常处理移动泵车，加入结果集
+          if (resultMap.has(name)) {
+            resultMap.get(name).value += value
+          } else {
+            resultMap.set(name, {
+              name,
+              value,
+              unit,
+              img
+            })
+          }
+        } else {
+          // 常规项处理
+          if (resultMap.has(name)) {
+            resultMap.get(name).value += value
+          } else {
+            resultMap.set(name, {
+              name,
+              value,
+              unit,
+              img
+            })
+          }
+        }
+      })
+
+      // 第二步：计算泵类值并添加到结果集
+      if (pumpTotal > 0) {
+        const finalPumpValue = pumpTotal - mobilePumpTotal
+        resultMap.set('泵', {
+          name: '泵',
+          value: finalPumpValue,
+          unit: pumpUnit,
+          img: pumpImg
+        })
+      }
+
+      return Array.from(resultMap.values())
+    },
+
+    setRem() {
+      // 默认使用100px作为基准大小
+      const baseSize = 100
+      const baseVal = baseSize / 1920
+      const vW = window.innerWidth // 当前窗口的宽度
+      const rem = vW * baseVal // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应font-size值
+      window.$size = rem / 100
+      document.documentElement.style.fontSize = rem + 'px'
+    },
+    calculateScreenSize() {
+      this.screenWidth = window.innerWidth
+      this.screenHeight = window.innerHeight
+      this.bgStyle = {
+        width: this.screenWidth + 'px',
+        height: this.screenHeight + 'px',
+        position: 'relative',
+        left: '0px'
+        // top:'-60px'
+      }
+      this.contentStyle = {
+        width: this.screenWidth + 'px',
+        height: this.screenHeight + 'px'
+      }
+    },
+    toUrl(path) {
+      this.$router.push(path)
+    },
+    selectArea(areaId) {
+      this.currentArea = areaId
+      this.getAreaMaterials(areaId)
+    },
+    getAreaMaterials(areaId) {
+      // 从areaList中找到对应区域的数据
+      const areaData = this.areaList.find(area => area.id === areaId)
+      if (areaData && areaData.floodMaterials) {
+        // 先处理物资数据，添加图片
+        const materialsWithImg = areaData.floodMaterials.map(item => {
+          const imgKey = this.getImgKey(item.name)
+          return {
+            ...item,
+            img: this.imgList[imgKey] || this.imgList['动力及照明类'] // 默认图片
+          }
+        })
+
+        // 使用mergeAndRename处理，确保与upList数据结构一致
+        this.areaMaterials = this.mergeAndRename(materialsWithImg)
+      } else {
+        this.areaMaterials = []
+      }
+    },
+    getBarWidth(value) {
+      const maxValue = Math.max(...this.teamsList.map(team => team.value))
+      return `${(value / maxValue) * 100}%`
+    },
+    getImgKey(materialName) {
+      // 根据物资名称返回对应的图片键值
+      const nameMap = {
+        动力及照明: '动力及照明类',
+        袋类: '袋类',
+        土工布类: '土工布类',
+        桩类: '桩类',
+        砂石类: '砂石类',
+        移动泵车: '移动泵车',
+        排水类: '排水类',
+        泵: '排水类'
+      }
+      return nameMap[materialName] || '动力及照明类'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .app-main {
+  padding: 0 !important;
+}
+
+.jsc {
+  height: 100%;
+  // background: url(../../assets/jsc/bg.png) no-repeat center top;
+  background: #05296f;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 10px;
+  padding-top: 0;
+
+  .jscC {
+    width: 100%;
+    height: 100%;
+    background: url(../../assets/jsc/contentBg.png) no-repeat center top;
+    background-size: 100% 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+    padding-top: 0.7rem;
+
+    &-top {
+      width: 17.67rem;
+      height: 1.52rem;
+      padding: 0 0.4rem;
+      // height: 100%;
+      background: url(../../assets/jsc/topbg.png) no-repeat center top;
+      background-size: 100% 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .label {
+        font-size: 0.2rem;
+        text-align: center;
+        color: #fff;
+      }
+
+      .value {
+        font-size: 0.38rem;
+        text-align: center;
+        color: #7ff7fe;
+        font-weight: bolder;
+      }
+    }
+
+    &-center {
+      width: 19rem;
+      padding: 0 0.2rem;
+      display: flex;
+      align-items: stretch;
+      justify-content: space-between;
+      gap: 30px;
+      height: calc(100vh - 2rem);
+      min-height: 600px;
+
+      // flex-wrap: wrap;
+      &-left {
+        width: 8rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        // height: 400px;
+        &-top {
+          margin-bottom: 20px;
+
+          .stats-cards {
+            display: flex;
+            gap: 15px;
+            justify-content: space-between;
+
+            .stat-card {
+              flex: 1;
+              background: linear-gradient(180deg, #040863 0%, #164dbd 100%);
+              border-radius: 6px;
+              padding: 30px 20px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              gap: 12px;
+              transition: all 0.3s ease;
+              min-height: 120px;
+
+              &:hover {
+                transform: translateY(-2px);
+                box-shadow: 0 4px 20px rgba(110, 198, 230, 0.3);
+              }
+
+              .stat-icon {
+                // width: 50px;
+                // height: 50px;
+                width: 115px;
+                height: 105px;
+                // background: linear-gradient(135deg, #6dcde6 0%, #4be3c1 100%);
+                border-radius: 12px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                flex-shrink: 0;
+
+                img {
+                  width: 115px;
+                  height: 105px;
+                  object-fit: contain;
+                }
+              }
+
+              .stat-content {
+                flex: 1;
+                text-align: center;
+
+                .stat-label {
+                  color: #fff;
+                  font-size: 14px;
+                  font-weight: 500;
+                  margin-bottom: 8px;
+                  text-align: center;
+                }
+
+                .stat-value {
+                  color: #36eafd;
+                  font-size: 20px;
+                  font-weight: bold;
+                  text-shadow: 0 2px 4px rgba(54, 234, 253, 0.3);
+                }
+              }
+            }
+          }
+        }
+
+        &-materials {
+          background: #040863;
+          padding: 30px;
+          border-radius: 6px;
+        }
+
+        &-title {
+          color: #fff;
+          text-align: left;
+          font-weight: bold;
+          margin-bottom: 30px;
+          font-size: 20px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-start;
+          gap: 8px;
+
+          .title-icon {
+            width: 14px;
+            height: 20px;
+            flex-shrink: 0;
+            margin-right: 5px;
+          }
+        }
+
+        &-content {
+          width: 100%;
+          display: grid;
+          grid-template-columns: repeat(3, 1fr);
+          gap: 15px;
+          // padding: 15px;
+          flex: 1;
+
+          & > div {
+            border: 1px solid #152e7b;
+            padding: 30px 15px;
+            text-align: left;
+            transition: all 0.3s ease;
+            position: relative;
+            min-height: 80px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            gap: 10px;
+            /* 四角三角形基础样式 */
+            & > .corner {
+              position: absolute;
+              border-style: solid;
+              z-index: 10;
+              border: none;
+              width: 10px;
+              height: 10px;
+              /* 确保显示在表格内容上方 */
+            }
+
+            /* 左上角 */
+            & > .top-left {
+              top: -1px;
+              left: -1px;
+              border-left: 2px solid #6dcde6;
+              border-top: 2px solid #6dcde6;
+            }
+
+            /* 右上角 */
+            & > .top-right {
+              top: -1px;
+              right: -1px;
+              border-right: 2px solid #6dcde6;
+              border-top: 2px solid #6dcde6;
+            }
+
+            /* 左下角 */
+            & > .bottom-left {
+              bottom: -1px;
+              left: -1px;
+              border-left: 2px solid #6dcde6;
+              border-bottom: 2px solid #6dcde6;
+            }
+
+            /* 右下角 */
+            & > .bottom-right {
+              bottom: -1px;
+              right: -1px;
+              border-right: 2px solid #6dcde6;
+              border-bottom: 2px solid #6dcde6;
+            }
+
+            &:hover {
+              transform: translateY(-2px);
+              box-shadow: 0 4px 20px rgba(110, 198, 230, 0.3);
+            }
+
+            & > img {
+              width: 30px;
+              height: 30px;
+              margin: 0;
+              flex-shrink: 0;
+            }
+
+            .item-info {
+              display: flex;
+              flex-direction: column;
+              align-items: flex-start;
+              text-align: left;
+              flex: 1;
+
+              span:first-of-type {
+                color: #fff;
+                font-size: 14px;
+                font-weight: 500;
+                margin-bottom: 3px;
+                display: block;
+              }
+
+              span:last-of-type {
+                color: #7ff7fe;
+                font-size: 16px;
+                font-weight: bold;
+                display: block;
+              }
+            }
+          }
+
+          // 泵类特殊样式 - 跨越底部一行
+          & > div:last-child {
+            grid-column: span 3;
+            justify-content: center;
+            text-align: center;
+
+            &:hover {
+              box-shadow: 0 4px 20px rgba(75, 227, 193, 0.3);
+            }
+
+            & > img {
+              margin: 0;
+            }
+
+            .item-info {
+              text-align: center !important;
+              align-items: center !important;
+              flex-direction: row !important;
+              gap: 10px !important;
+              justify-content: center !important;
+              width: 100% !important;
+            }
+
+            .item-info span:first-of-type {
+              margin-right: 5px !important;
+              margin-bottom: 0 !important;
+              display: inline !important;
+            }
+
+            .item-info span:last-of-type {
+              color: #4be3c1 !important;
+              display: inline !important;
+            }
+          }
+        }
+      }
+
+      &-center {
+        width: 6rem;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        z-index:99;
+        /* 确保地图组件撑满容器 */
+        :deep(.echartsMap) {
+          width: 100% !important;
+          height: 100% !important;
+        }
+      }
+
+      &-right {
+        width: 5rem;
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+
+        .jscC-center-right-top,
+        .jscC-center-right-bottom {
+          // background: rgba(11, 27, 58, 0.8);
+          // border-radius: 12px;
+          padding: 20px;
+          // border: 1px solid rgba(110, 198, 230, 0.3);
+          flex: 1;
+          padding-top:0;
+          .section-title {
+            color: #fff;
+            font-size: 20px;
+            font-weight: bold;
+            text-align: center;
+            // margin-bottom: 15px;
+            padding-bottom: 10px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-start;
+            gap: 8px;
+
+            .title-icon {
+              width: 14px;
+              height: 20px;
+              flex-shrink: 0;
+              margin-right: 5px;
+            }
+          }
+
+          i {
+            font-size: 14px;
+            color: #4be3c1;
+          }
+        }
+
+        .area-selector {
+          display: flex;
+          align-items: center;
+          gap: 10px;
+          margin-bottom: 15px;
+
+          i {
+            color: #6dcde6;
+            cursor: pointer;
+            font-size: 16px;
+
+            &:hover {
+              color: #4be3c1;
+            }
+          }
+
+                     .area-list {
+             display: flex;
+             gap: 8px;
+             flex: 1;
+             overflow-x: auto;
+             background: #051a59;
+             padding:3px 10px;
+             border-radius: 20px;
+             
+             /* 隐藏滚动条 */
+             scrollbar-width: none; /* Firefox */
+             -ms-overflow-style: none; /* IE and Edge */
+             
+             /* Webkit browsers (Chrome, Safari, etc.) */
+             &::-webkit-scrollbar {
+               display: none;
+             }
+            .area-item {
+              padding: 6px 12px;
+              // background: rgba(110, 198, 230, 0.1);
+              // border: 1px solid rgba(110, 198, 230, 0.3);
+              border-radius: 20px;
+              color: #89ace8;
+              font-size: 12px;
+              cursor: pointer;
+              white-space: nowrap;
+              transition: all 0.3s ease;
+
+              &:hover {
+                background: rgba(110, 198, 230, 0.2);
+                // border-color: rgba(110, 198, 230, 0.6);
+              }
+
+              &.active {
+                background: rgba(110, 198, 230, 0.2);
+                color: #fff;
+                // border-color: #6dcde6;
+              }
+            }
+          }
+        }
+
+        .materials-grid {
+          display: grid;
+          grid-template-columns: repeat(2, 1fr);
+          gap: 10px;
+          flex: 1;
+
+          .material-item {
+            border: 1px solid #152e7b;
+            padding: 5px 10px;
+            text-align: left;
+            transition: all 0.3s ease;
+            position: relative;
+            min-height: 70px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            gap: 10px;
+
+            /* 四角三角形基础样式 */
+            & > .corner {
+              position: absolute;
+              border-style: solid;
+              z-index: 10;
+              border: none;
+              width: 10px;
+              height: 10px;
+              /* 确保显示在表格内容上方 */
+            }
+
+            /* 左上角 */
+            & > .top-left {
+              top: -1px;
+              left: -1px;
+              border-left: 2px solid #6dcde6;
+              border-top: 2px solid #6dcde6;
+            }
+
+            /* 右上角 */
+            & > .top-right {
+              top: -1px;
+              right: -1px;
+              border-right: 2px solid #6dcde6;
+              border-top: 2px solid #6dcde6;
+            }
+
+            /* 左下角 */
+            & > .bottom-left {
+              bottom: -1px;
+              left: -1px;
+              border-left: 2px solid #6dcde6;
+              border-bottom: 2px solid #6dcde6;
+            }
+
+            /* 右下角 */
+            & > .bottom-right {
+              bottom: -1px;
+              right: -1px;
+              border-right: 2px solid #6dcde6;
+              border-bottom: 2px solid #6dcde6;
+            }
+
+            &:hover {
+              transform: translateY(-2px);
+              box-shadow: 0 4px 20px rgba(110, 198, 230, 0.3);
+            }
+
+            img {
+              width: 30px;
+              height: 30px;
+              margin: 0;
+              flex-shrink: 0;
+            }
+
+            .item-info {
+              display: flex;
+              flex-direction: column;
+              align-items: flex-start;
+              text-align: left;
+              flex: 1;
+
+              .material-name {
+                color: #fff;
+                font-size: 14px;
+                font-weight: 500;
+                margin-bottom: 3px;
+                display: block;
+              }
+
+              .material-value {
+                color: #7ff7fe;
+                font-size: 16px;
+                font-weight: bold;
+                display: block;
+              }
+            }
+
+            // 泵类特殊样式 - 跨越底部一行
+            &:last-child {
+              grid-column: span 2;
+              justify-content: center;
+              text-align: center;
+
+              &:hover {
+                box-shadow: 0 4px 20px rgba(75, 227, 193, 0.3);
+              }
+
+              & > img {
+                margin: 0;
+              }
+
+              .item-info {
+                text-align: center !important;
+                align-items: center !important;
+                flex-direction: row !important;
+                gap: 10px !important;
+                justify-content: center !important;
+                width: 100% !important;
+              }
+
+              .item-info .material-name {
+                margin-right: 5px !important;
+                margin-bottom: 0 !important;
+                display: inline !important;
+              }
+
+              .item-info .material-value {
+                color: #4be3c1 !important;
+                display: inline !important;
+              }
+            }
+          }
+        }
+
+        .teams-chart {
+          display: flex;
+          flex-direction: column;
+          gap: 8px;
+
+          .team-item {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+
+            .team-name {
+              color: #6dcde6;
+              font-size: 12px;
+              min-width: 60px;
+              text-align:right;
+            }
+
+            .team-bar {
+              flex: 1;
+              height: 8px;
+              background: rgba(110, 198, 230, 0.2);
+              border-radius: 4px;
+              overflow: hidden;
+
+              .bar-fill {
+                height: 100%;
+                background: linear-gradient(90deg, #6dcde6 0%, #ff6b9d 100%);
+                border-radius: 4px;
+                transition: width 0.3s ease;
+              }
+            }
+
+            .team-value {
+              color: #7ff7fe;
+              font-size: 12px;
+              font-weight: bold;
+              min-width: 40px;
+              text-align: right;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>