From 1cc916c53cf62951f6fd62a8e41e37524f15b4c1 Mon Sep 17 00:00:00 2001
From: ym1026 <1539963735@qq.com>
Date: Thu, 4 Sep 2025 16:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/Home/Alarm.vue             |  19 +-
 web/src/components/Home/Charge.vue            |  20 +-
 web/src/components/Home/Energy.vue            |  20 +-
 web/src/components/Home/Map.vue               |   3 +-
 web/src/components/Home/Modal.vue             | 253 +++---
 web/src/components/Home/Modal/DisCharge.vue   |  22 +-
 web/src/components/Home/Modal/Revenue.vue     |  23 +-
 .../components/Home/Modal/StatisticalInfo.vue |  12 +-
 web/src/components/Home/Modal/Utilization.vue |  21 +-
 web/src/components/Home/Pv.vue                |  19 +-
 web/src/components/Home/onLine.vue            |   4 +
 web/src/components/SearchBox.vue              |   5 +
 .../statisticalAnalysis/energyEchart.vue      | 220 +----
 web/src/router/index.js                       |   2 +-
 web/src/utils/dealWithData.js                 |  37 +
 web/src/views/statisticalAnalysis.vue         | 755 +++++++-----------
 web/src/views/sub/Home.vue                    |  29 +-
 web/src/views/system/user.vue                 |  12 +-
 18 files changed, 517 insertions(+), 959 deletions(-)
 create mode 100644 web/src/utils/dealWithData.js

diff --git a/web/src/components/Home/Alarm.vue b/web/src/components/Home/Alarm.vue
index 95128e5..5e5a0ea 100644
--- a/web/src/components/Home/Alarm.vue
+++ b/web/src/components/Home/Alarm.vue
@@ -12,6 +12,7 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
 export default {
   name: '',
   props: {
@@ -100,25 +101,11 @@ export default {
     handleResize() {
       this.faultChart.resize()
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.dt) - new Date(b.dt)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
-
-      return {
-        dates,
-        values
-      }
-    },
+ 
     getChargeData() {
       const arr = this.curList
       const keyList = this.curList.map((item) => item.key)
-      const result = this.processData(this.deviceInfo, keyList)
+      const result = processData(this.deviceInfo, keyList)
 
       this.lineChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Charge.vue b/web/src/components/Home/Charge.vue
index f26eea2..096536b 100644
--- a/web/src/components/Home/Charge.vue
+++ b/web/src/components/Home/Charge.vue
@@ -12,6 +12,8 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
+
 export default {
   name: '',
   props: {
@@ -110,25 +112,11 @@ export default {
         this.chargeChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.dt) - new Date(b.dt)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
-
-      return {
-        dates,
-        values
-      }
-    },
+   
     getChargeData() {
       const arr = this.curListEcharts
       const keyList = this.curListEcharts.map((item) => item.key)
-      const result = this.processData(this.deviceInfo, keyList)
+      const result = processData(this.deviceInfo, keyList)
 
       this.chargeChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Energy.vue b/web/src/components/Home/Energy.vue
index 75ec49c..280838a 100644
--- a/web/src/components/Home/Energy.vue
+++ b/web/src/components/Home/Energy.vue
@@ -14,6 +14,8 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
+
 export default {
   name: '',
   props: {
@@ -92,25 +94,11 @@ export default {
         this.energyChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.dt) - new Date(b.dt)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
-
-      return {
-        dates,
-        values
-      }
-    },
+ 
     getChargeData() {
       const arr = this.curList
       const keyList = this.curList.map((item) => item.key)
-      const result = this.processData(this.deviceInfo, keyList)
+      const result = processData(this.deviceInfo, keyList)
 
       this.energyChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Map.vue b/web/src/components/Home/Map.vue
index f6f41d1..91b334f 100644
--- a/web/src/components/Home/Map.vue
+++ b/web/src/components/Home/Map.vue
@@ -23,7 +23,7 @@
       </template>
       <div class="modal-content">
         <div class="home-modal">
-          <Modal></Modal>
+          <Modal :station-id="changeStationId"></Modal>
         </div>
       </div>
     </a-modal>
@@ -50,7 +50,6 @@ export default {
   methods: {
     async showModal(currentVal) {
       this.changeStationId=currentVal.id
-      this.$emit('changeStation',this.changeStationId)
       console.log(currentVal, 'cccccccccccccccccccccc')
       this.showCtrModal = true
       try {
diff --git a/web/src/components/Home/Modal.vue b/web/src/components/Home/Modal.vue
index 2a0bcc7..67da635 100644
--- a/web/src/components/Home/Modal.vue
+++ b/web/src/components/Home/Modal.vue
@@ -1,27 +1,31 @@
 <template>
   <div class="Home">
     <div class="content-left">
-      <div v-for="(item, i) in leftList" :key="i" :class="`grid-item ${item.class}`">
+      <div v-for="item in leftList" :key="item.componentId" :class="`grid-item ${item.class}`">
         <div class="tool">
           <div class="title">
-           
             <span class="linear-text">{{ item.title }}</span>
           </div>
         </div>
-        <component :is="item.componentId"  :props-total="deviceInfo.allTotal" :props-info="deviceInfo[item.infoKey]" ></component>
-        
+        <component
+          :is="item.componentId"
+          :props-total="modalInfo.allTotal"
+          :props-info="modalInfo[item.infoKey]"
+        ></component>
       </div>
     </div>
-    
     <div class="content-right">
-      <div v-for="(item, i) in rightList" :key="i" :class="`grid-item ${item.class}`">
+      <div v-for="item in rightList" :key="item.componentId" :class="`grid-item ${item.class}`">
         <div class="tool">
           <div class="title">
-          
             <span class="linear-text">{{ item.title }}</span>
           </div>
         </div>
-        <component :is="item.componentId" :props-total="deviceInfo.allTotal" :props-info="deviceInfo[item.infoKey]" ></component>
+        <component
+          :is="item.componentId"
+          :props-total="modalInfo.allTotal"
+          :props-info="modalInfo[item.infoKey]"
+        ></component>
       </div>
     </div>
   </div>
@@ -35,61 +39,66 @@ import Revenue from '@/components/Home/Modal/Revenue.vue'
 import Utilization from '@/components/Home/Modal/Utilization.vue'
 import DisCharge from '@/components/Home/Modal/DisCharge.vue'
 import { getReq, postReq } from '@/request/api'
-
+import { getRunDays, getDateDaysAgo } from '@/utils/dealWithData'
 import EnvInfo from './Modal/EnvInfo.vue'
 
 export default {
   name: 'Home',
   components: {},
+  props: {
+    stationId: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
-      deviceInfo: {},
+      modalInfo: {},
       list: [
         {
           title: '预制舱信息',
           class: '',
           componentId: PrefabCabin,
-          infoKey: 'prefabCabin'
+          infoKey: ''
         },
         {
           title: '储能充放电量',
           class: 'stats-cards',
           componentId: DisCharge,
-          infoKey: 'alarm'
+          infoKey: 'energy'
         },
         {
           title: '运行信息',
           class: 'operation-status',
           componentId: OperationalInfo,
-          infoKey: 'operation'
+          infoKey: ''
         },
         {
           title: '场站收益情况',
           class: 'revenue',
           componentId: Revenue,
-          infoKey: 'alarm'
+          infoKey: 'energy'
         },
 
         {
           title: '统计信息',
           class: 'statistical',
           componentId: StatisticalInfo,
-          infoKey: 'statisticalInfo'
+          infoKey: ''
         },
         {
           title: '设备利用率',
           class: '',
           componentId: Utilization,
-          infoKey: 'alarm'
+          infoKey: 'energy'
         },
         {
           title: '环境信息',
           class: 'envInfo',
           componentId: EnvInfo,
-          infoKey: 'envInfo'
+          infoKey: ''
         }
       ],
-
       sysName: '',
       user: JSON.parse(localStorage.getItem('user')) || {}
     }
@@ -104,142 +113,67 @@ export default {
   },
   async mounted() {
     await Promise.all([
-      this.getTotalList(),
-
-      ( this.deviceInfo = {
-        alarm: [
-          {
-            dt: '2025-08-30',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-29',
-            key1: 8,
-            key2: 5,
-            key3: 5,
-            key4: 7
-          },
-          {
-            dt: '2025-08-28',
-            key1: 0,
-            key2: 10,
-            key3: 20,
-            key4: 4
-          },
-          {
-            dt: '2025-08-27',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-26',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-25',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-24',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-23',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-22',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-21',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-20',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-19',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-18',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          },
-          {
-            dt: '2025-08-17',
-            key1: 10,
-            key2: 0,
-            key3: 15,
-            key4: 5
-          }
-        ],
-       
-      }),
-     
-      
+      this.getStatTotalList(),
+      this.getStatDayList(1),
     ])
   },
- 
 
   methods: {
-    async  getTotalList(){
+    // 查询系统累计统计信息
+    async getStatTotalList() {
       try {
         // token: 用户TOKEN
-        const res = await getReq({}, '')
-        if (res.code === 200) {
-          this.deviceInfo.allTotal = res.data
+        // date:日期
+        // station_id:场站ID，为0或不传查询所有场站总计
+        // category:类别，1:储能设备,2:充电设备,3:光伏设备,为0或不传查询所有类别总计
+        const query = {
+          date: getDateDaysAgo(0),
+          stationId: this.stationId,
+          category: 0
+        }
+        const res = await getReq('/api/queryStatTotal', query)
+        if (res.errcode === 0) {
+          this.modalInfo.allTotal = res.data
+          this.modalInfo.allTotal.runDays = getRunDays(res.data.launch_date)
+          const { income_charge: incomeCharge, income_elect: incomeElect } = this.modalInfo.allTotal
+          this.modalInfo.allTotal.incomeTotal = +incomeCharge + +incomeElect
         } else {
           throw res
         }
       } catch (error) {
-        this.deviceInfo.allTotal = {
-          tianshu:11,
-          shouyi:12,
-          shuliang:10,
-          fadianliang:15,
-          key2:11,
-          key1:12,
-          key3:10,
-          key4:15,
-          rongliang:15,
+        this.modalInfo.allTotal = {}
+      }
+    },
+    // 查询场站日统计信息
+    async getStatDayList(category) {
+      try {
+        // station_id: 场站ID
+        // category: 类别： 1：储能设备,2:充电设备,3:光伏设备
+        // start_date：开始日期，格式：yyyy-mm-dd
+        // end_date：结束日期，格式：yyyy-mm-dd
+        const query = {
+          stationId: this.stationId,
+          category,
+          start_date: getDateDaysAgo(7 - 1),
+          end_date: getDateDaysAgo(0)
         }
+        const categoryObj = { 1: 'energy' }
+        const res = await getReq('/api/queryStatDayList', query)
+        if (res.errcode === 0) {
+          this.modalInfo[categoryObj[category]] = res.data.map((item) => {
+            const { income_charge: incomeCharge, income_elect: incomeElect } = item
+            return {
+              ...item,
+              incomeTotal: +incomeCharge + +incomeElect
+            }
+          })
+        } else {
+          throw res
+        }
+      } catch (error) {
+        console.log(error)
       }
     }
-
   }
 }
 </script>
@@ -253,8 +187,6 @@ export default {
   justify-content: space-between;
 }
 
-
-
 .content-left,
 .content-right {
   height: 100%;
@@ -270,15 +202,15 @@ export default {
   width: 100%;
   height: calc(40% - 10px);
   z-index: 20;
- 
-&:nth-child(2n){
+
+  &:nth-child(2n) {
     // height:calc(33% - 10px)!important;
-}
+  }
   .tool {
     background: url('@/assets/home/modal-header-bg.png');
-     background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
 
     display: flex;
     justify-content: space-between;
@@ -286,7 +218,7 @@ export default {
     height: 45px;
 
     .linear-text {
-        margin-bottom: 7px;
+      margin-bottom: 7px;
       background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, rgba(40, 235, 231, 1) 100%);
       color: transparent;
       -webkit-background-clip: text;
@@ -315,7 +247,7 @@ export default {
 
   .title {
     display: flex;
-   
+
     i {
       margin-left: 10px;
     }
@@ -336,19 +268,14 @@ export default {
       color: transparent;
     }
   }
-
- 
 }
-  .operation-status{
+.operation-status {
   height: calc(25% - 10px);
-
-  }
-  .statistical{
+}
+.statistical {
   height: calc(18% - 10px);
-
-  }
-  .envInfo{
-    height:  calc(15% - 10px);
-
-  }
+}
+.envInfo {
+  height: calc(15% - 10px);
+}
 </style>
diff --git a/web/src/components/Home/Modal/DisCharge.vue b/web/src/components/Home/Modal/DisCharge.vue
index 2af9149..e10d1ea 100644
--- a/web/src/components/Home/Modal/DisCharge.vue
+++ b/web/src/components/Home/Modal/DisCharge.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
+
 export default {
   name: '',
   props: {
@@ -18,14 +20,14 @@ export default {
       curList: [
         {
           name: '日充电电量',
-          key: 'key1',
+          key: 'storage_elect_in',
           lineColor: '#9BD801',
           value: 0,
           d: 'kW·h'
         },
         {
           name: '日放电电量',
-          key: 'key2',
+          key: 'storage_elect_out',
           lineColor: '#3DFEFA',
           value: 0,
           d: 'kW·h'
@@ -66,25 +68,11 @@ export default {
         this.disChargeChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.date) - new Date(b.date)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
 
-      return {
-        dates,
-        values
-      }
-    },
     getDisChargeData() {
       const arr = this.curList
       const keyList = this.curList.map((item) => item.key)
-      const result = this.processData(this.propsInfo, keyList)
+      const result = processData(this.propsInfo, keyList)
 
       this.disChargeChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Modal/Revenue.vue b/web/src/components/Home/Modal/Revenue.vue
index e3eb441..77849be 100644
--- a/web/src/components/Home/Modal/Revenue.vue
+++ b/web/src/components/Home/Modal/Revenue.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
+
 export default {
   name: '',
   props: {
@@ -19,7 +21,7 @@ export default {
       curList: [
         {
           name: '日收益',
-          key: 'key1',
+          key: 'incomeTotal',
           lineColor: '#00BBA3',
           colorStart: ' rgba(10, 250, 106, 0.15)',
           colorEnd: ' rgba(171, 255, 249, 0.3)',
@@ -64,26 +66,11 @@ export default {
         this.revenueChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.date) - new Date(b.date)
-      })
-      const dates = data.map((item) => item.dt)
-      const values=[]
-      keys.forEach((item,index)=>{
-        
-        values[index]= data.map((dataValue)=>dataValue[keys[index]])
-      })
-    
-      return {
-        dates,
-        values,
-      }
-    },
+
     getRevenueData() {
       const arr=this.curList
       const keyList=this.curList.map((item)=>item.key)
-      const result = this.processData(this.propsInfo, keyList)
+      const result = processData(this.propsInfo, keyList)
 
       this.RevenueChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Modal/StatisticalInfo.vue b/web/src/components/Home/Modal/StatisticalInfo.vue
index 52c3412..8850454 100644
--- a/web/src/components/Home/Modal/StatisticalInfo.vue
+++ b/web/src/components/Home/Modal/StatisticalInfo.vue
@@ -29,7 +29,7 @@ export default {
     return {
       list: [
         {
-          key: 'tianshu',
+          key: 'runDays',
           value: 26,
           d: '天',
           label: '场站运行天数',
@@ -37,7 +37,7 @@ export default {
           iconPath: require('@/assets/home/wendu.png')
         },
         {
-          key: 'shouyi',
+          key: 'storage_elect_in',
           value: 25,
           d: 'Kw·h',
           label: '储能充电量',
@@ -45,7 +45,7 @@ export default {
           iconPath: require('@/assets/home/shidu.png')
         },
         {
-          key: 'shuliang',
+          key: 'storage_elect_out',
           value: 24,
           d: 'Kw·h',
           label: '储能放电量',
@@ -53,15 +53,15 @@ export default {
           iconPath: require('@/assets/home/dianya.png')
         },
         {
-          key: 'shuliang',
+          key: 'incomeTotal',
           value: 26,
-          d: '万元',
+          d: '元',
           label: '场站累计收益',
           class: 'item-4',
           iconPath: require('@/assets/home/dianliu.png')
         },
         {
-          key: 'fadianliang',
+          key: 'usage_rate',
           value: 20,
           d: '%',
           label: '设备利用率',
diff --git a/web/src/components/Home/Modal/Utilization.vue b/web/src/components/Home/Modal/Utilization.vue
index fca94a6..582282a 100644
--- a/web/src/components/Home/Modal/Utilization.vue
+++ b/web/src/components/Home/Modal/Utilization.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
+
 export default {
   name: '',
   props: {
@@ -18,9 +20,8 @@ export default {
       curList: [
         {
           name: '日设备利用率',
-          key: 'key1',
+          key: 'usage_rate',
           lineColor: '#F69B52',
-
           value: 0,
           d: 'kW·h'
         }
@@ -60,25 +61,11 @@ export default {
         this.utilizationChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.date) - new Date(b.date)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
 
-      return {
-        dates,
-        values
-      }
-    },
     getUtilizationData() {
       const arr = this.curList
       const keyList = this.curList.map((item) => item.key)
-      const result = this.processData(this.propsInfo, keyList)
+      const result = processData(this.propsInfo, keyList)
 
       this.utilizationChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/Pv.vue b/web/src/components/Home/Pv.vue
index 3081eef..19f69ec 100644
--- a/web/src/components/Home/Pv.vue
+++ b/web/src/components/Home/Pv.vue
@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import {processData} from '@/utils/dealWithData'
 export default {
   name: '',
   props: {
@@ -93,25 +94,11 @@ export default {
         this.pvChart.resize()
       }
     },
-    processData(data, keys) {
-      data.sort((a, b) => {
-        return new Date(a.dt) - new Date(b.dt)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
-
-      return {
-        dates,
-        values
-      }
-    },
+   
     getChargeData() {
       const arr = this.curList
       const keyList = this.curList.map((item) => item.key)
-      const result = this.processData(this.deviceInfo, keyList)
+      const result = processData(this.deviceInfo, keyList)
 
       this.pvChartData.xdata = result.dates
       arr.forEach((item, index) => {
diff --git a/web/src/components/Home/onLine.vue b/web/src/components/Home/onLine.vue
index 674f594..c9f551d 100644
--- a/web/src/components/Home/onLine.vue
+++ b/web/src/components/Home/onLine.vue
@@ -155,6 +155,10 @@ export default {
   align-items: center;
   justify-content: space-around;
   height: 100%;
+  .item{
+    align-items: flex-start;
+    justify-content: center;
+  }
 }
 // .content-left{
 //  align-items: self-end;
diff --git a/web/src/components/SearchBox.vue b/web/src/components/SearchBox.vue
index e90ded8..5781a79 100644
--- a/web/src/components/SearchBox.vue
+++ b/web/src/components/SearchBox.vue
@@ -33,6 +33,11 @@
                 @change="$emit('onSearch', formData)"
               />
             </div>
+            <!-- 日期选择框 date-->
+            <div class="date-picker" v-if="item.type == 'datePick1'">
+              
+                <a-range-picker v-model:value="formData[item.key]"    value-format="YYYY-MM-DD" @change="$emit('onSearch', formData)" />
+            </div>
             <!-- 输入框 -->
             <div class="input" v-if="item.type == 'input'">
               <a-input
diff --git a/web/src/components/statisticalAnalysis/energyEchart.vue b/web/src/components/statisticalAnalysis/energyEchart.vue
index 66e0414..ba404ed 100644
--- a/web/src/components/statisticalAnalysis/energyEchart.vue
+++ b/web/src/components/statisticalAnalysis/energyEchart.vue
@@ -10,7 +10,6 @@
       </div>
     </div>
     <div class="content-table">
-       
       <ComTable
         :columns="columns"
         :table-data="tableData"
@@ -24,16 +23,17 @@
   </div>
 </template>
 <script>
-import {postReq} from '@/request/api'
+import { processData } from '@/utils/dealWithData'
+import { postReq } from '@/request/api'
 import ComTable from '@/components/ComTable'
 export default {
   name: 'StatisicalAnView',
   components: { ComTable },
   props: {
-    tableInfo:{
+    tableInfo: {
       type: Object,
       default: () => ({}), // 默认空对象
-      required: false,    // 非必须
+      required: false // 非必须
     },
     columns: {
       type: Array,
@@ -52,7 +52,7 @@ export default {
     },
     tableData: {
       type: Array,
-      default: () => ([]), // 默认空对象
+      default: () => [] // 默认空对象
     }
   },
   data() {
@@ -62,180 +62,17 @@ export default {
         scroll: {
           x: 1500
         },
-        select: false,
+        select: false
       },
       tableH: 0,
-      
-      //   chartOptions: [
-      //     {
-      //       title: '充放电分析',
-      //       type: 'bar',
-      //       dataKey: 'sales',
-      //       infoKeys: [
-      //         { key: 'key1', label: '日充电电量', lineColor: '#2A82E4' },
-      //         { key: 'key2', label: '日放电电量', lineColor: '#5AABF2' }
-      //       ]
-      //     },
-      //     {
-      //       title: '运行状态分析',
-      //       type: 'bar',
-      //       dataKey: 'users',
-      //       infoKeys: [
-      //         { key: 'key1', label: '日故障次数', lineColor: '#0CDAF5' },
-      //         { key: 'key2', label: '日充电工作时长', lineColor: '#2A82E4' },
-      //         { key: 'key3', label: '日放电工作时长', lineColor: '#5AABF2' }
-      //       ]
-      //     },
-      //     {
-      //       title: '电压与电流分析',
-      //       type: 'line',
-      //       dataKey: 'stock',
-      //       infoKeys: [
-      //         {
-      //           key: 'key1',
-      //           label: '电压',
-      //           lineColor: '#3F80F2',
-      //           colorStart: ' rgba(10, 250, 106, 0.15)',
-      //           colorEnd: ' rgba(171, 255, 249, 0.3)'
-      //         },
-      //         {
-      //           key: 'key2',
-      //           label: '电流',
-      //           lineColor: '#A9A6FF',
-      //           colorStart: ' rgba(10, 250, 106, 0.15)',
-      //           colorEnd: ' rgba(171, 255, 249, 0.3)'
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       title: '功率分析',
-      //       type: 'line',
-      //       dataKey: 'yearly',
-      //       infoKeys: [
-      //         {
-      //           key: 'key1',
-      //           label: '功率',
-      //           lineColor: '#00FFFB',
-      //           colorStart: ' rgba(10, 250, 106, 0.15)',
-      //           colorEnd: ' rgba(171, 255, 249, 0.3)'
-      //         }
-      //       ]
-      //     }
-      //   ],
-      //   chartData: {
-      //     sales: [
-      //       {
-      //         date: '2025-08-30',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-29',
-      //         key1: 8,
-      //         key2: 5,
-      //         key3: 5,
-      //         key4: 7
-      //       },
-      //       {
-      //         date: '2025-08-28',
-      //         key1: 0,
-      //         key2: 10,
-      //         key3: 20,
-      //         key4: 4
-      //       },
-      //       {
-      //         date: '2025-08-27',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-26',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-25',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-24',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-23',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-22',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-21',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-20',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-19',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-18',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       },
-      //       {
-      //         date: '2025-08-17',
-      //         key1: 10,
-      //         key2: 0,
-      //         key3: 15,
-      //         key4: 5
-      //       }
-      //     ],
-      //     users: [
-      //       { value: 40, name: 'A' },
-      //       { value: 60, name: 'B' }
-      //     ],
-      //     stock: [30, 50, 80],
-      //     yearly: [100, 120, 90, 110]
-      //   },
+
       chartInstances: [] // 存储 ECharts 实例
     }
   },
-  watch:{
+  watch: {
     chartData: {
       handler(n) {
+        console.log(n, 'nnnnnnnnnnnnnnnnnnnnnnn')
         this.$nextTick(() => {
           this.initCharts()
           window.addEventListener('resize', this.handleResize)
@@ -244,7 +81,8 @@ export default {
     }
   },
   mounted() {
-    
+    // this.initCharts()
+    // window.addEventListener('resize', this.handleResize)
   },
   beforeUnmount() {
     window.removeEventListener('resize', this.handleResize)
@@ -255,10 +93,9 @@ export default {
       this.chartOptions.forEach((option, index) => {
         const dom = this.$refs[`chartContainer${index}`][0]
         if (!dom) return
-
         const chart = this.$echarts.init(dom)
         this.chartInstances.push(chart) // 存储实例
-
+        const keys= option.infoKeys.map((item) => item.key)
         // 设置图表配置
         chart.setOption({
           tooltip: {
@@ -281,8 +118,9 @@ export default {
           },
           xAxis: {
             type: 'category',
-            data: this.processData(option.infoKeys, option.dataKey, this.chartData[option.dataKey])
+            data: processData(this.chartData,keys)
               .dates,
+
             axisLine: {
               lineStyle: { type: 'dashed', color: '#435463' }
             },
@@ -328,41 +166,23 @@ export default {
               },
               global: false,
               showSymbol: false,
-              data: this.processData(
-                option.infoKeys,
-                option.dataKey,
-                this.chartData[option.dataKey]
+              data: processData(
+                this.chartData,
+                keys
               ).values[i]
+
             }
           })
         })
       })
     },
-    processData(keysList, dataKey, data) {
-      const keys = keysList.map((item) => item.key)
-      data.sort((a, b) => {
-        return new Date(a.dt) - new Date(b.dt)
-      })
-      const dates = data.map((item) => item.dt)
-      const values = []
 
-      keys.forEach((item, index) => {
-        values[index] = data.map((dataValue) => dataValue[keys[index]])
-      })
-      return {
-        dates,
-        values
-      }
-    },
     handleResize() {
       this.chartInstances.forEach((chart) => chart && chart.resize())
     },
- 
+
     handlePagesizeChange(pageOption) {
-      this.$emit('pagesizeChange_energy',pageOption)
-      // this.pageOption.pageSize = pageOption.pageSize
-      // this.pageOption.current = pageOption.current
-      // this.getList()
+      this.$emit('pagesizeChange_energy', pageOption)
     }
   }
 }
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 6a84bbd..cc583a5 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -35,7 +35,7 @@ export const routes = [
       {
         path: 'system',
         name: 'system',
-        redirect: '/system/policy',
+        redirect: '/main/system/user',
         component: () => import(/* webpackChunkName: "system" */ '@/views/system/index.vue'),
         children: [
           {
diff --git a/web/src/utils/dealWithData.js b/web/src/utils/dealWithData.js
new file mode 100644
index 0000000..c85a981
--- /dev/null
+++ b/web/src/utils/dealWithData.js
@@ -0,0 +1,37 @@
+export function getRunDays(date) {
+  const launchDate = new Date(date)
+  const today = new Date() // 替换为当前日期
+
+  const timeDiff = today - launchDate // 毫秒差
+  const daysRun = Math.ceil(timeDiff / (1000 * 60 * 60 * 24)) // 转换为天数
+
+  console.log(`从 2023-01-01 到今天已经运行了 ${daysRun} 天`)
+
+  return daysRun
+}
+export function processData(data, keys) {
+  data.sort((a, b) => {
+    return new Date(a.dt) - new Date(b.dt)
+  })
+  const dates = data.map((item) => item.dt)
+  const values = []
+  keys.forEach((item, index) => {
+    values[index] = data.map((dataValue) => dataValue[keys[index]])
+  })
+
+  return {
+    dates,
+    values
+  }
+}
+
+export function getDateDaysAgo(daysAgo) {
+  const date = new Date()
+  date.setDate(date.getDate() - daysAgo)
+
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+
+  return `${year}-${month}-${day}`
+}
diff --git a/web/src/views/statisticalAnalysis.vue b/web/src/views/statisticalAnalysis.vue
index abfe5c6..a08001f 100644
--- a/web/src/views/statisticalAnalysis.vue
+++ b/web/src/views/statisticalAnalysis.vue
@@ -22,6 +22,7 @@
     </div>
     <div class="main_content">
       <energyEchart
+         :key="activeKey"
         :chart-options="echartsInfo[activeKey].chartOptions"
         :chart-data="echartsInfo[activeKey].chartData"
         :columns="tableList[activeKey].columns"
@@ -29,6 +30,7 @@
         :table-data="tableList[activeKey].tableData"
         @pagesizeChange="pagesizeChange()"
       ></energyEchart>
+     
     </div>
   </div>
 </template>
@@ -36,7 +38,9 @@
 <script>
 import energyEchart from '@/components/statisticalAnalysis/energyEchart.vue'
 import searchBox from '@/components/SearchBox.vue'
-import { postReq } from '@/request/api'
+import { postReq, getReq } from '@/request/api'
+import { getRunDays, getDateDaysAgo } from '@/utils/dealWithData'
+
 export default {
   name: 'StatisicalAnView',
   components: { energyEchart, searchBox },
@@ -64,7 +68,7 @@ export default {
       searchOptions: [
         {
           label: '日期',
-          type: 'datePick',
+          type: 'datePick1',
           value: [],
           key: 'time'
         }
@@ -77,8 +81,8 @@ export default {
               type: 'bar',
               dataKey: 'sales',
               infoKeys: [
-                { key: 'key1', label: '日充电电量', lineColor: '#2A82E4' },
-                { key: 'key2', label: '日放电电量', lineColor: '#5AABF2' }
+                { key: 'storage_elect_in', label: '日充电电量', lineColor: '#2A82E4' },
+                { key: 'storage_elect_out', label: '日放电电量', lineColor: '#5AABF2' }
               ]
             },
             {
@@ -86,7 +90,7 @@ export default {
               type: 'bar',
               dataKey: 'users',
               infoKeys: [
-                { key: 'key1', label: '日故障次数', lineColor: '#0CDAF5' },
+                { key: 'storage_num_err', label: '日故障次数', lineColor: '#0CDAF5' },
                 { key: 'key2', label: '日充电工作时长', lineColor: '#2A82E4' },
                 { key: 'key3', label: '日放电工作时长', lineColor: '#5AABF2' }
               ]
@@ -128,20 +132,135 @@ export default {
             }
           ],
           chartData: {}
+        },
+        1: {
+          chartOptions: [
+            {
+              title: '发电电量分析',
+              type: 'bar',
+              dataKey: 'sales',
+              infoKeys: [
+                { key: 'storage_elect_in', label: '日发电电量', lineColor: '#2A82E4' },
+              ]
+            },
+            {
+              title: '运行状态分析',
+              type: 'bar',
+              dataKey: 'users',
+              infoKeys: [
+                { key: 'storage_num_err', label: '日故障次数', lineColor: '#0CDAF5' },
+                { key: 'key3', label: '日发电时长', lineColor: '#5AABF2' }
+              ]
+            },
+            {
+              title: '电压与电流分析',
+              type: 'line',
+              dataKey: 'stock',
+              infoKeys: [
+                {
+                  key: 'key1',
+                  label: '电压',
+                  lineColor: '#3F80F2',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                },
+                {
+                  key: 'key2',
+                  label: '电流',
+                  lineColor: '#A9A6FF',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                }
+              ]
+            },
+            {
+              title: '功率分析',
+              type: 'line',
+              dataKey: 'yearly',
+              infoKeys: [
+                {
+                  key: 'key1',
+                  label: '功率',
+                  lineColor: '#00FFFB',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                }
+              ]
+            }
+          ],
+          chartData: {}
+        },
+        2: {
+          chartOptions: [
+            {
+              title: '充电分析',
+              type: 'bar',
+              dataKey: 'sales',
+              infoKeys: [
+                { key: 'storage_elect_in', label: '日充电电量', lineColor: '#2A82E4' },
+              ]
+            },
+            {
+              title: '运行状态分析',
+              type: 'bar',
+              dataKey: 'users',
+              infoKeys: [
+                { key: 'storage_num_err', label: '日充电次数', lineColor: '#0CDAF5' },
+                { key: 'key3', label: '日故障次数', lineColor: '#5AABF2' },
+                { key: 'key3', label: '日充电时长', lineColor: '#5AABF2' }
+              ]
+            },
+            {
+              title: '电压与电流分析',
+              type: 'line',
+              dataKey: 'stock',
+              infoKeys: [
+                {
+                  key: 'key1',
+                  label: '电压',
+                  lineColor: '#3F80F2',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                },
+                {
+                  key: 'key2',
+                  label: '电流',
+                  lineColor: '#A9A6FF',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                }
+              ]
+            },
+            {
+              title: '功率分析',
+              type: 'line',
+              dataKey: 'yearly',
+              infoKeys: [
+                {
+                  key: 'key1',
+                  label: '功率',
+                  lineColor: '#00FFFB',
+                  colorStart: ' rgba(10, 250, 106, 0.15)',
+                  colorEnd: ' rgba(171, 255, 249, 0.3)'
+                }
+              ]
+            }
+          ],
+          chartData: {}
         }
       },
       activeKey: 0,
       tabList: [
         {
-          key: '0',
+          key: 0,
           name: '储能设备'
         },
         {
-          key: '1',
+          key: 1,
           name: '光伏设备'
         },
         {
-          key: '2',
+          key: 2,
           name: '充电设备'
         }
       ],
@@ -150,8 +269,8 @@ export default {
           columns: [
             {
               title: '设备ID',
-              dataIndex: 'key1',
-              key: 'key1',
+              dataIndex: 'ID',
+              key: 'ID',
               width: 120,
               ellipsis: true
             },
@@ -171,8 +290,8 @@ export default {
             },
             {
               title: '充电电量',
-              dataIndex: 'key4',
-              key: 'key4',
+              dataIndex: 'storage_elect_in',
+              key: 'storage_elect_in',
               width: 120,
               ellipsis: true
             },
@@ -192,22 +311,22 @@ export default {
             },
             {
               title: '放电电量',
-              dataIndex: 'key7',
-              key: 'key7',
+              dataIndex: 'storage_elect_out',
+              key: 'storage_elect_out',
               width: 120,
               ellipsis: true
             },
             {
               title: '故障次数',
-              dataIndex: 'key8',
-              key: 'key8',
+              dataIndex: 'storage_num_err',
+              key: 'storage_num_err',
               width: 120,
               ellipsis: true
             },
             {
               title: '日期',
-              dataIndex: 'key9',
-              key: 'key9',
+              dataIndex: 'dt',
+              key: 'dt',
               width: 120,
               ellipsis: true
             }
@@ -215,33 +334,173 @@ export default {
           geturl: '',
           tableData: [],
           pageOption: {
-            current: 1,
+            page: 1,
             pageSize: 10,
-            total: 1
+            count: 1
+          }
+        },
+        1: {
+          columns: [
+            {
+              title: '设备ID',
+              dataIndex: 'ID',
+              key: 'ID',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '设备名称',
+              dataIndex: 'key2',
+              key: 'key2',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '设备类型',
+              dataIndex: 'key3',
+              key: 'key3',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '发电电量',
+              dataIndex: 'storage_elect_in',
+              key: 'storage_elect_in',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '发电时长',
+              dataIndex: 'key5',
+              key: 'key5',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '故障次数',
+              dataIndex: 'key6',
+              key: 'key6',
+              width: 120,
+              ellipsis: true
+            },
+           
+            {
+              title: '日期',
+              dataIndex: 'dt',
+              key: 'dt',
+              width: 120,
+              ellipsis: true
+            }
+          ],
+          geturl: '',
+          tableData: [],
+          pageOption: {
+            page: 1,
+            pageSize: 10,
+            count: 1
+          }
+        },
+        2: {
+          columns: [
+            {
+              title: '设备ID',
+              dataIndex: 'ID',
+              key: 'ID',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '设备名称',
+              dataIndex: 'key2',
+              key: 'key2',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '设备类型',
+              dataIndex: 'key3',
+              key: 'key3',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '充电电量',
+              dataIndex: 'storage_elect_in',
+              key: 'storage_elect_in',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '充电时长',
+              dataIndex: 'key5',
+              key: 'key5',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '充电次数',
+              dataIndex: 'key6',
+              key: 'key6',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '故障次数',
+              dataIndex: 'key6',
+              key: 'key6',
+              width: 120,
+              ellipsis: true
+            },
+            {
+              title: '日期',
+              dataIndex: 'dt',
+              key: 'dt',
+              width: 120,
+              ellipsis: true
+            }
+          ],
+          geturl: '',
+          tableData: [],
+          pageOption: {
+            page: 1,
+            pageSize: 10,
+            count: 1
           }
         }
       }
     }
   },
+  watch:{
+    activeKey(newVal, oldVal) {
+      console.log(newVal, oldVal,"activeKey")
+      // 清空旧数据（可选）
+      if( this.echartsInfo[oldVal]){
+        this.echartsInfo[oldVal].chartData = {};
+        this.tableList[oldVal].tableData = [];
+        // // 重新加载数据
+        this.getTableList()
+        this.getEchartsList()
+      }
+     
+ 
+    
+    }
+  },
   async mounted() {
-    await Promise.all([
-      this.getTableList(),
-      this.getEchartsList()
-    ])
+    await Promise.all([this.getTableList(), this.getEchartsList()])
   },
   beforeUnmount() {},
   methods: {
     pagesizeChange(e) {
-      console.log(e, 'eeeeeeeeeeeeeee')
-
       this.tableList[this.activeKey].pageOption.pageSize = e.pageSize
-      this.tableList[this.activeKey].pageOption.current = e.current
+      this.tableList[this.activeKey].pageOption.page = e.page
       this.getTableList()
     },
     onSearch(data) {
-      this.paramsDate.startTime = data.time ? data.time[0] : ''
-      this.paramsDate.endTime = data.time ? data.time[1] : ''
-      this.pageOption.current = 1
+      this.paramsDate.start_date = data.time ? data.time[0] : ''
+      this.paramsDate.end_date = data.time ? data.time[1] : ''
+
+      this.tableList[this.activeKey].pageOption.page = 1
 
       this.getTableList()
       this.getEchartsList()
@@ -251,419 +510,23 @@ export default {
 
       const query = {
         ...this.paramsDate,
-        category: this.categoryArr.map((item) => item.label == this.activeKey)[0].type
+        category: this.categoryArr.map((item) => item.label == this.activeKey)[0].type,
+        // start_date: getDateDaysAgo(7 - 1),
+        // end_date: getDateDaysAgo(0)
       }
       try {
-        const res = await postReq(query,  '')
-        if (res.code === 200) {
-          this.echartsInfo[this.activeKey].chartData= res.data
-         
+        const res = await getReq('/api/queryStatDayList', query)
+        if (res.errcode === 0) {
+          this.echartsInfo[this.activeKey].chartData = res.data
+          console.log(
+            this.echartsInfo[this.activeKey].chartData,
+            ' this.echartsInfo[this.activeKey].chartData'
+          )
         } else {
           throw res
         }
       } catch (error) {
-        this.echartsInfo[this.activeKey].chartData = {
-          sales: [
-            {
-              date: '2025-08-30',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-29',
-              key1: 8,
-              key2: 5,
-              key3: 5,
-              key4: 7
-            },
-            {
-              date: '2025-08-28',
-              key1: 0,
-              key2: 10,
-              key3: 20,
-              key4: 4
-            },
-            {
-              date: '2025-08-27',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-26',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-25',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-24',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-23',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-22',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-21',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-20',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-19',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-18',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-17',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            }
-          ],
-          users: [
-            {
-              date: '2025-08-30',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-29',
-              key1: 8,
-              key2: 5,
-              key3: 5,
-              key4: 7
-            },
-            {
-              date: '2025-08-28',
-              key1: 0,
-              key2: 10,
-              key3: 20,
-              key4: 4
-            },
-            {
-              date: '2025-08-27',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-26',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-25',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-24',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-23',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-22',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-21',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-20',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-19',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-18',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-17',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            }
-          ],
-          stock: [
-            {
-              date: '2025-08-30',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-29',
-              key1: 8,
-              key2: 5,
-              key3: 5,
-              key4: 7
-            },
-            {
-              date: '2025-08-28',
-              key1: 0,
-              key2: 10,
-              key3: 20,
-              key4: 4
-            },
-            {
-              date: '2025-08-27',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-26',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-25',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-24',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-23',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-22',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-21',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-20',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-19',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-18',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-17',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            }
-          ],
-          yearly: [
-            {
-              date: '2025-08-30',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-29',
-              key1: 8,
-              key2: 5,
-              key3: 5,
-              key4: 7
-            },
-            {
-              date: '2025-08-28',
-              key1: 0,
-              key2: 10,
-              key3: 20,
-              key4: 4
-            },
-            {
-              date: '2025-08-27',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-26',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-25',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-24',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-23',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-22',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-21',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-20',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-19',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-18',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            },
-            {
-              date: '2025-08-17',
-              key1: 10,
-              key2: 0,
-              key3: 15,
-              key4: 5
-            }
-          ]
-        }
+        this.echartsInfo[this.activeKey].chartData = {}
       }
     },
 
@@ -672,23 +535,23 @@ export default {
       const query = {
         ...this.paramsDate,
         category: this.categoryArr.map((item) => item.label == this.activeKey)[0].type,
-        pageSize: currentInfo.pageOption.pageSize,
-        pageNumber: currentInfo.pageOption.current
+        page_size: currentInfo.pageOption.pageSize,
+        pageNumber: currentInfo.pageOption.page
       }
       try {
-        const res = await postReq(query, currentInfo.getUrl)
-        if (res.code === 200) {
-          currentInfo.tableData = res.data.records
+        const res = await getReq('/api/queryStatDayList', query)
+        if (res.errcode === 0) {
+          currentInfo.tableData = res.data
           currentInfo.pageOption = {
-            current: res.data.pageNumber,
-            pageSize: res.data.pageSize,
-            total: res.data.totalRow
+            page: res.data.page,
+            pageSize: res.data.page_size,
+            count: res.data.count
           }
         } else {
           throw res
         }
       } catch (error) {
-        this.tableList[this.activeKey].tableData = [
+        currentInfo.tableData = [
           {
             key1: '1515151515',
             key2: '设备1111',
diff --git a/web/src/views/sub/Home.vue b/web/src/views/sub/Home.vue
index 9535410..9536932 100644
--- a/web/src/views/sub/Home.vue
+++ b/web/src/views/sub/Home.vue
@@ -57,6 +57,8 @@ import Pv from '@/components/Home/Pv.vue'
 import Alarm from '@/components/Home/Alarm.vue'
 import Map from '@/components/Home/Map.vue'
 import { getReq, postReq } from '@/request/api'
+import {getRunDays,getDateDaysAgo} from '@/utils/dealWithData'
+
 export default {
   name: 'Home',
   components: { Map },
@@ -355,7 +357,7 @@ export default {
         const res = await getReq('/api/queryStatSystem')
         if (res.errcode === 0) {
           this.deviceInfo.onLine = JSON.parse(JSON.stringify(res.data))
-          this.deviceInfo.onLine.runDays = this.getRunDays(res.data.launch_date)
+          this.deviceInfo.onLine.runDays = getRunDays(res.data.launch_date)
           console.log(JSON.parse(JSON.stringify(res.data)), this.deviceInfo.onLine, '111111111111')
         } else {
           throw res
@@ -364,17 +366,7 @@ export default {
         this.deviceInfo.onLine = {}
       }
     },
-    getRunDays(date) {
-      const launchDate = new Date(date)
-      const today = new Date() // 替换为当前日期
 
-      const timeDiff = today - launchDate // 毫秒差
-      const daysRun = Math.ceil(timeDiff / (1000 * 60 * 60 * 24)) // 转换为天数
-
-      console.log(`从 2023-01-01 到今天已经运行了 ${daysRun} 天`)
-
-      return daysRun
-    },
     // 查询系统累计统计信息
     async getStatTotalList() {
       try {
@@ -417,16 +409,7 @@ export default {
           this.deviceInfo.allTotal.incomeCharge + this.deviceInfo.allTotal.incomeElect
       }
     },
-    getDateDaysAgo(daysAgo) {
-      const date = new Date()
-      date.setDate(date.getDate() - daysAgo)
-
-      const year = date.getFullYear()
-      const month = String(date.getMonth() + 1).padStart(2, '0')
-      const day = String(date.getDate()).padStart(2, '0')
-
-      return `${year}-${month}-${day}`
-    },
+  
 
     // 示例：获取7天前的日期
     // 查询场站日统计信息
@@ -439,8 +422,8 @@ export default {
         const query = {
           stationId: this.stationId,
           category,
-          start_date: this.getDateDaysAgo(7 - 1),
-          end_date: this.getDateDaysAgo(0)
+          start_date: getDateDaysAgo(7 - 1),
+          end_date: getDateDaysAgo(0)
         }
         const arr = { 1: 'energy', 2: 'charge', 3: 'pv' }
         const res = await getReq('/api/queryStatDayList', query)
diff --git a/web/src/views/system/user.vue b/web/src/views/system/user.vue
index 830361c..4459358 100644
--- a/web/src/views/system/user.vue
+++ b/web/src/views/system/user.vue
@@ -1,13 +1,21 @@
    <template>
-     <div >
-   
+     <div  class="user">
+      <SearchBox></SearchBox>
+
+      <div class="table-content">
+
+      </div>
+
+      
      </div>
    </template>
    
 <script>
+import SearchBox from '@/components/SearchBox.vue'
 export default {
   name: '',
   components:{
+    SearchBox
   },
   props: {