From f5fc1d64ec83069e5a8ee9d369ebf7e4b2a8af5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Mon, 25 Aug 2025 14:29:27 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/dzjk.js               |  4 +--
 src/views/ems/dzjk/gzgj/index.vue | 41 +++---------------------------
 src/views/ems/dzjk/zxlt/index.vue | 42 +++++++++++++++++++++++--------
 3 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index eb2d979..5faf472 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -93,9 +93,9 @@ export function getAmmeterDataList(siteId) {
 }
 
 // 故障告警
-export function getAlarmDetailList({siteId, deviceId, alarmLevel, alarmStartTime, alarmEndTime,pageSize,pageNum}) {
+export function getAlarmDetailList({status,siteId, deviceId, alarmLevel, alarmStartTime, alarmEndTime,pageSize,pageNum}) {
   return request({
-    url: `/ems/siteAlarm/getAlarmDetailList?siteId=${siteId}&deviceId=${deviceId}&alarmLevel=${alarmLevel}&alarmStartTime=${alarmStartTime}&alarmEndTime=${alarmEndTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
+    url: `/ems/siteAlarm/getAlarmDetailList?siteId=${siteId}&status=${status}&deviceId=${deviceId}&alarmLevel=${alarmLevel}&alarmStartTime=${alarmStartTime}&alarmEndTime=${alarmEndTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
     method: 'get'
   })
 }
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index 3108136..d600f42 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -124,7 +124,7 @@ export default {
     return {
       loading:false,
       btnList:[
-        {name:'今日告警',id:'today'},
+        {name:'未处理告警',id:'today'},
         {name:'历史告警',id:'history'},
       ],
       deviceOptions:[],//设备列表
@@ -173,17 +173,6 @@ export default {
     onSearch(){
       this.pageNum =1//每次搜索从1开始搜索
       const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
-      // 选中了时间范围
-      if(alarmStartTime && alarmStartTime){
-        // 如果选择的时间范围是今天
-        if(this.isSameDay(alarmStartTime,alarmEndTime) && this.isSameDay(alarmStartTime,new Date())){
-          this.activeBtn = 'today'
-        }else {
-          this.activeBtn = 'history'
-        }
-      }else{
-        //没有选择时间范围 还是按照选中的今日告警、历史告警查询
-      }
       this.getData()
     },
     // 重置
@@ -198,17 +187,6 @@ export default {
       if(id !== this.activeBtn){
         console.log('点击了不同的菜单，更新数据')
         this.activeBtn=id;
-        const [alarmStartTime,alarmEndTime]=(this.dateRange || [])
-        // 切换到今日告警，如果已经选择了时间范围清空
-        if(alarmStartTime && alarmEndTime){
-          // 如果切换到了今日告警，时间范围不相等或者相等但是不是今天 清空时间选择范围
-          if(id === 'today' && !this.isSameDay(alarmStartTime,alarmEndTime) || (this.isSameDay(alarmStartTime,alarmEndTime) && !this.isSameDay(alarmStartTime,new Date()))){
-            this.dateRange = []
-          }else if(id === 'history' && this.isSameDay(alarmStartTime,alarmEndTime) && this.isSameDay(alarmStartTime,new Date())){
-            // 切换成历史告警，但是选择时间范围是当天，清空时间范围
-            this.dateRange = []
-          }
-        }
         this.getData()
       }
     },
@@ -218,21 +196,8 @@ export default {
       const {deviceId,alarmLevel} = this.search
       const {siteId,pageNum,pageSize,activeBtn} =this
       const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
-      let start='',end = '',now =new Date()
-      if(activeBtn === 'today'){
-        start = end = now
-      }else{
-        if(alarmStartTime && alarmEndTime){
-          start = alarmStartTime
-          end = alarmEndTime
-        }else{
-          start=''
-          end = ''
-            // now
-          // end.setDate(end.getDate() - 1);
-        }
-      }
-      getAlarmDetailList({deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(start),alarmEndTime:formatDate(end)}).then(response => {
+      let status = activeBtn === 'today' ? '0' : '1,2'
+      getAlarmDetailList({status,deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(alarmStartTime),alarmEndTime:formatDate(alarmEndTime)}).then(response => {
         this.tableData=response?.rows || [];
         this.totalSize = response?.total || 0
       }).finally(() => {this.loading=false})
diff --git a/src/views/ems/dzjk/zxlt/index.vue b/src/views/ems/dzjk/zxlt/index.vue
index 98a3999..d8a2dfd 100644
--- a/src/views/ems/dzjk/zxlt/index.vue
+++ b/src/views/ems/dzjk/zxlt/index.vue
@@ -112,11 +112,14 @@
                   >
                     {{ communicationStatusOptions[item.communicationStatus] }}
                   </div>
-                  <div class="row-items-img">
-                    <img
-                      class="img-bms"
-                      :src="require('@/assets/images/ems/bms.png')"
-                    />
+                  <div class="row-items-img row-items-img-bms">
+                    <div style="position:relative;">
+                      <img
+                        class="img-bms"
+                        :src="require('@/assets/images/ems/bms.png')"
+                      />
+                      <div class="num">{{item.batteryNum || 0}}</div>
+                    </div>
                     <div class="name">{{ item.deviceName }}</div>
                   </div>
                 </div>
@@ -179,11 +182,14 @@
                       ]
                     }}
                   </div>
-                  <div class="row-items-img">
-                    <img
-                      class="img-pcs"
-                      :src="require('@/assets/images/ems/bms.png')"
-                    />
+                  <div class="row-items-img row-items-img-bms">
+                    <div style="position: relative">
+                      <img
+                        class="img-bms"
+                        :src="require('@/assets/images/ems/bms.png')"
+                      />
+                      <div class="num">{{item.batteryNum || 0}}</div>
+                    </div>
                     <div class="name">{{ item.children[0].deviceName }}</div>
                   </div>
                 </div>
@@ -505,10 +511,26 @@ $lineColor: #86bcc7;
           .row-items-img {
             position: relative;
             padding-top: 12px;
+            &.row-items-img-bms{
+              padding-top: 14px;
+              .num{
+                position: absolute;
+                top: -2px;
+                right: -2px;
+                font-size: 10px;
+                line-height: 10px;
+                padding: 2px 4px;
+                text-align: center;
+                border-radius: 10px;
+                background-color: #03c69d;
+                color: #fff;
+              }
+            }
             img {
               width: 80px;
               height: auto;
               display: block;
+              position: relative;
               &.img-lq {
                 width: 50px;
               }

From 8808b256829c38a62429f070e2540fb70bd3b59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Mon, 1 Sep 2025 18:06:56 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/ems.js       |   1 +
 src/views/ems/search/index.vue | 136 +++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 src/views/ems/search/index.vue

diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js
index cad9f32..2bc171c 100644
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@@ -14,6 +14,7 @@ const ems = {
     ticketStatusOptions:{0:'待处理', 1:'已处理', 2:'处理中'},//工单处理状态
     strategyStatusOptions:{'0':'未启用', '1':'已运行', '2':'已暂停', '3':'禁用', '4':'删除'},//策略状态
     chargeStatusOptions:{'1':'充电','2':'待机'},//冲放状态
+    deviceCategoryOptions:{'PCS':'PCS','STACK':'电池堆','CLUSTER':'电池簇','COOLING':'液冷','BATTERY':'单体电池','AMMETER':'电表'},//设备类别
   },
   mutations: {
     SET_ZD_LIST(state, list) {
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
new file mode 100644
index 0000000..45d4e8c
--- /dev/null
+++ b/src/views/ems/search/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <div v-loading="loading" class="ems-dashboard-editor-container" style="background-color: #ffffff">
+    <el-form ref="form" :model="form" label-position="top">
+      <el-form-item
+          label="站点"
+          prop="siteId"
+          :rules="[{ required: true, message: '请选择站点' }]"
+      >
+        <el-checkbox-group v-model="form.siteId">
+          <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
+            {{ item.siteName }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="设备" prop="deviceCategory" :rules="[{ required: true, message: '请选择设备' }]">
+        <el-radio-group v-model="form.deviceCategory" >
+          <el-radio v-for="([value,name],index) in deviceCategoryList" :key="index+'sbListSearch'" :label="value">
+            {{ name }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <div style="display: flex">
+        <el-form-item label="点位" prop="point" :rules="[{ required: true, message: '请输入点位' }]" style="width: 200px;margin-right: 50px">
+          <el-input
+            v-model="form.point"
+            placeholder="请输入点位"
+            type="text"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="横坐标" prop="xAxios" :rules="[{ required: true, message: '请选择横坐标' }]">
+          <el-radio-group v-model="form.xAxios">
+            <el-radio label="hour">时</el-radio>
+            <el-radio label="minute">分</el-radio>
+            <el-radio label="second">秒</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">生成图表</el-button>
+      </el-form-item>
+    </el-form>
+    <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+      <div slot="header" class="time-range-header">
+        <span class="card-title"></span>
+        <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
+      </div>
+      <div style="height: 310px" id="searchChart"></div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import resize from '@/mixins/ems/resize'
+import {mapState} from "vuex";
+import {getAllSites} from "@/api/ems/zddt";
+import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+export default {
+  name: "Search",
+  mixins: [resize],
+  components: {DateRangeSelect},
+  computed: {
+    ...mapState({
+      deviceCategoryOptions: state => state?.ems?.deviceCategoryOptions || {},
+    }),
+    //设备列表
+    deviceCategoryList() {
+      // deviceCategoryOptions:{'PCS':'PCS','STACK':'电池堆','CLUSTER':'电池簇','COOLING':'液冷','BATTERY':'单体电池','AMMETER':'电表'},//设备类别
+      return Object.entries(this.deviceCategoryOptions).filter(([key, value]) => {
+        return ['STACK', 'CLUSTER', 'BATTERY', 'AMMETER'].includes(key)
+      })
+    },
+  },
+  data() {
+    return {
+      chart: null,
+      timeRange:[],
+      siteList: [],//站点列表
+      form: {
+        siteId: [],//当前选中的站点id 默认选中第一个站点
+        deviceCategory: '',//设备
+        point: '',//点位
+        xAxios: '',//横坐标
+      },
+      loading: false,
+    }
+  },
+  methods: {
+    showLoading(){
+      this.chart && this.chart.showLoading()
+    },
+    hideLoading(){
+      this.chart && this.chart.hideLoading()
+    },
+    initChart() {
+      this.chart = echarts.init(document.querySelector('#searchChart'))
+    },
+    // 更新时间范围 重置图表
+    updateDate(data){
+      this.timeRange=data
+      this.getDate()
+    },
+    submitForm() {
+      this.$refs.form.validate(valid => {
+        valid && this.getDate()
+      })
+    },
+    getZdList() {
+      return getAllSites().then(response => {
+        this.siteList = response.data || []
+        console.log("获取站点列表返回数据", this.siteList)
+        // this.siteList.length > 0 && (this.form.siteId = [this.siteList[0].siteId])
+      }).finally(() => {
+        this.loading = false;
+        this.searchLoading = false
+      })
+    },
+    getDate(){
+
+    },
+    init() {
+
+    },
+  },
+  mounted() {
+    this.getZdList()
+    this.initChart()
+    this.$refs.dateRangeSelect.init()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

From 243724c9a649cc8df7562e8f91442b9a77f85a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Thu, 4 Sep 2025 15:37:15 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/search.js          |  24 ++++
 src/views/ems/search/index.vue | 193 ++++++++++++++++++++++++---------
 2 files changed, 163 insertions(+), 54 deletions(-)
 create mode 100644 src/api/ems/search.js

diff --git a/src/api/ems/search.js b/src/api/ems/search.js
new file mode 100644
index 0000000..f53e504
--- /dev/null
+++ b/src/api/ems/search.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+// 获取设备列表
+export function getAllDeviceCategory() {
+  return request({
+    url: '/ems/generalQuery/getAllDeviceCategory',
+    method: 'get'
+  })
+}
+// 点位列表
+export function pointFuzzyQuery(data) {
+  return request({
+    url: '/ems/generalQuery/pointFuzzyQuery',
+    method: 'post',
+    data
+  })
+}
+// 图表
+export function getPointValueList(data) {
+  return request({
+    url: '/ems/generalQuery/getPointValueList',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 45d4e8c..2e4f6fe 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -3,36 +3,36 @@
     <el-form ref="form" :model="form" label-position="top">
       <el-form-item
           label="站点"
-          prop="siteId"
+          prop="siteIds"
           :rules="[{ required: true, message: '请选择站点' }]"
       >
-        <el-checkbox-group v-model="form.siteId">
+        <el-checkbox-group v-model="form.siteIds">
           <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
             {{ item.siteName }}
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item label="设备" prop="deviceCategory" :rules="[{ required: true, message: '请选择设备' }]">
-        <el-radio-group v-model="form.deviceCategory" >
-          <el-radio v-for="([value,name],index) in deviceCategoryList" :key="index+'sbListSearch'" :label="value">
-            {{ name }}
+      <el-form-item label="设备" prop="categoryName" :rules="[{ required: true, message: '请选择设备' }]">
+        <el-radio-group v-model="form.categoryName" >
+          <el-radio v-for="(key,index) in deviceCategoryList" :key="index+'sbListSearch'" :label="key">
+            {{ key }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
       <div style="display: flex">
-        <el-form-item label="点位" prop="point" :rules="[{ required: true, message: '请输入点位' }]" style="width: 200px;margin-right: 50px">
-          <el-input
-            v-model="form.point"
-            placeholder="请输入点位"
-            type="text"
-          >
-          </el-input>
+        <el-form-item label="点位" prop="pointName"  :rules="[{ required: true, message: '请输入点位' }]" style="width: 200px;margin-right: 50px">
+          <el-autocomplete
+              v-model="form.pointName"
+              placeholder="请输入点位"
+              :fetch-suggestions="querySearchAsync"
+              @select="handleSelect"
+          ></el-autocomplete>
         </el-form-item>
-        <el-form-item label="横坐标" prop="xAxios" :rules="[{ required: true, message: '请选择横坐标' }]">
-          <el-radio-group v-model="form.xAxios">
-            <el-radio label="hour">时</el-radio>
-            <el-radio label="minute">分</el-radio>
-            <el-radio label="second">秒</el-radio>
+        <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">
+          <el-radio-group v-model="form.dataUnit">
+            <el-radio :label="1">分钟</el-radio>
+            <el-radio :label="2">小时</el-radio>
+            <el-radio :label="3">天</el-radio>
           </el-radio-group>
         </el-form-item>
       </div>
@@ -43,7 +43,6 @@
     <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
       <div slot="header" class="time-range-header">
         <span class="card-title"></span>
-        <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
       </div>
       <div style="height: 310px" id="searchChart"></div>
     </el-card>
@@ -53,35 +52,23 @@
 <script>
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
-import {mapState} from "vuex";
 import {getAllSites} from "@/api/ems/zddt";
-import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+import {getAllDeviceCategory,getPointValueList,pointFuzzyQuery} from '@/api/ems/search'
 export default {
   name: "Search",
   mixins: [resize],
-  components: {DateRangeSelect},
   computed: {
-    ...mapState({
-      deviceCategoryOptions: state => state?.ems?.deviceCategoryOptions || {},
-    }),
-    //设备列表
-    deviceCategoryList() {
-      // deviceCategoryOptions:{'PCS':'PCS','STACK':'电池堆','CLUSTER':'电池簇','COOLING':'液冷','BATTERY':'单体电池','AMMETER':'电表'},//设备类别
-      return Object.entries(this.deviceCategoryOptions).filter(([key, value]) => {
-        return ['STACK', 'CLUSTER', 'BATTERY', 'AMMETER'].includes(key)
-      })
-    },
   },
   data() {
     return {
       chart: null,
-      timeRange:[],
+      deviceCategoryList:[],//设备列表
       siteList: [],//站点列表
       form: {
-        siteId: [],//当前选中的站点id 默认选中第一个站点
-        deviceCategory: '',//设备
-        point: '',//点位
-        xAxios: '',//横坐标
+        siteIds: [],//当前选中的站点id 默认选中第一个站点
+        categoryName: '',//设备
+        pointName: '',//点位
+        dataUnit: '',//横坐标
       },
       loading: false,
     }
@@ -96,37 +83,135 @@ export default {
     initChart() {
       this.chart = echarts.init(document.querySelector('#searchChart'))
     },
-    // 更新时间范围 重置图表
-    updateDate(data){
-      this.timeRange=data
-      this.getDate()
+    setOption(data) {
+      if(!this.chart) return
+      this.chart.clear()
+      console.log('返回的数据',data)
+      let dataset=[]
+      if(data.length>0){
+        data.forEach((item,index)=>{
+          item.deviceList.forEach(inner=>{
+            dataset.push({
+              name:`${this.siteList.find(s=>s.siteId === item.siteId)?.siteName || ''}-${inner.deviceId}`,
+              type:'line',
+              xdata:[],
+              data:[]
+            })
+            const length = dataset.length
+            inner.pointValueList.forEach(value=>{
+              dataset[length-1].xdata.push(value.valueDate)
+              dataset[length-1].data.push(value.pointValue)
+            })
+          })
+        })
+      }else{
+        this.$message.warning('暂无数据')
+      }
+      console.log('图表数据',dataset)
+      this.chart.setOption({
+        legend: {
+          left: 'center',
+          top: '10',
+        },
+        grid: {
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        textStyle:{
+          color:"#333333",
+        },
+        xAxis: {type:'category',data:dataset?.[0]?.xdata || []},
+        yAxis: {
+          type: 'value',
+        },
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 100
+          },
+          {
+            start: 0,
+            end: 100
+          }
+        ],
+        series: dataset
+      })
     },
     submitForm() {
-      this.$refs.form.validate(valid => {
-        valid && this.getDate()
+      this.getDate()
+    },
+    handleSelect(data){
+      this.form.pointName = data.value
+    },
+    querySearchAsync(query,cb){
+      // query = query.trim()
+      console.log('查询数据',query)
+      if(this.form.siteIds.length===0 || !this.form.categoryName){
+        this.$message({
+          type: 'warning',
+          message: '请先选择站点和设备',
+        })
+        return cb([])
+      }
+      pointFuzzyQuery({
+        siteIds:this.form.siteIds,
+        categoryName:this.form.categoryName,
+        pointName:query,
+      }).then(response => {
+        const data  = response?.data || []
+        cb(data.map(item => {
+          return {name: item, value: item}
+        }))
+      })
+    },
+    // 获取所有设备
+    getDeviceCategory(){
+      return getAllDeviceCategory().then(response => {
+        this.deviceCategoryList=response?.data || []
       })
     },
     getZdList() {
       return getAllSites().then(response => {
         this.siteList = response.data || []
-        console.log("获取站点列表返回数据", this.siteList)
-        // this.siteList.length > 0 && (this.form.siteId = [this.siteList[0].siteId])
       }).finally(() => {
-        this.loading = false;
-        this.searchLoading = false
       })
     },
     getDate(){
-
-    },
-    init() {
-
+      this.$refs.form.validate(valid => {
+        if(valid){
+          if(!this.form.pointName){
+            return this.$message.error('请输入正确的点位');
+          }
+          this.loading = true
+          const{siteIds,dataUnit,categoryName,pointName}=this.form
+          getPointValueList({siteIds,dataUnit,categoryName,pointName}).then(response => {
+            this.setOption(response?.data || [])
+          }).finally(()=>{
+            this.loading = false
+          })
+        }
+      })
     },
   },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
   mounted() {
-    this.getZdList()
-    this.initChart()
-    this.$refs.dateRangeSelect.init()
+    this.loading= true
+    this.$nextTick(()=>{
+      this.initChart()
+      Promise.all([this.getDeviceCategory(), this.getZdList()]).finally(()=>this.loading=false)
+    })
   }
 }
 </script>

From c5026887371b67f38725174734fc215665ba97c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Thu, 4 Sep 2025 20:12:05 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/filters/ems.js                      |   2 +-
 src/views/ems/search/DateTimeSelect.vue | 142 ++++++++++++++++++++++++
 src/views/ems/search/index.vue          |  79 ++++++++++++-
 3 files changed, 220 insertions(+), 3 deletions(-)
 create mode 100644 src/views/ems/search/DateTimeSelect.vue

diff --git a/src/filters/ems.js b/src/filters/ems.js
index df51d22..cfc0572 100644
--- a/src/filters/ems.js
+++ b/src/filters/ems.js
@@ -17,7 +17,7 @@ export const formatDate = (val,toSeconds = false,onlyTime=false) => {
   if(!toSeconds){
     return front
   } else{
-    return front +''+back
+    return front +' '+back
   }
 
 
diff --git a/src/views/ems/search/DateTimeSelect.vue b/src/views/ems/search/DateTimeSelect.vue
new file mode 100644
index 0000000..515b760
--- /dev/null
+++ b/src/views/ems/search/DateTimeSelect.vue
@@ -0,0 +1,142 @@
+<template>
+    <div class="time-range">
+        <el-date-picker
+            v-model="dateRange"
+            :type="type"
+            range-separator="至"
+            start-placeholder="开始时间"
+            :format="valueFormat"
+            :value-format="valueFormat"
+            :clearable="false"
+            :picker-options="pickerOptions"
+            end-placeholder="结束时间">
+            </el-date-picker>
+            <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
+            <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
+            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
+            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">下一时段</el-button>
+        </div>
+</template>
+
+<script>
+import {formatDate} from '@/filters/ems'
+export default {
+  props:{
+    dataUnit:{
+      type:Number,
+      default:1
+    }
+  },
+  computed:{
+    type(){
+      return this.dataUnit === 3 ? 'daterange' : 'datetimerange'
+    },
+    valueFormat(){
+      return this.dataUnit === 3 ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm'
+    },
+    disabledNextBtn(){
+      if(this.dateRange && this.dateRange.length ===2){
+        return new Date(this.dateRange[1]) >= new Date(this.defaultDateRange[1])
+      }else{
+        return true
+      }
+
+    }
+  },
+  watch:{
+    dataUnit:{
+      handler(newVal,oldVal){
+        console.log('wacth到了dataUnit的变化',newVal,oldVal)
+        newVal && newVal!==oldVal && this.init()
+      },
+      immediate: true,
+    }
+  },
+  data() {
+    return {
+      loading:false,
+      dateRange:[],
+      defaultDateRange:[],
+      pickerOptions:{
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+    }
+  },
+  methods: {
+    init(){
+      const {dataUnit} = this
+        const timeDis= dataUnit === 3? 30 * 24 * 60 * 60 * 1000 :dataUnit === 2 ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000
+        const now = new Date(),formatNow = formatDate(now.getTime(),dataUnit !== 3 );
+        const timeAgo = formatDate(new Date(now.getTime() - timeDis),dataUnit !== 3)
+        this.dateRange = [timeAgo, formatNow];
+        this.defaultDateRange=[timeAgo, formatNow];
+        console.log('init',timeAgo,formatNow)
+        this.$emit('updateDate',this.dateRange || [])
+    },
+    showBtnLoading(status){
+        this.loading = status
+    },
+    // 切换分、时、天 重置时间可选范围
+    resetDate(){
+      this.dateRange = this.defaultDateRange
+    },
+    //重置 设置时间范围为初始化时间段
+    reset(){
+        this.resetDate()
+        this.$emit('updateDate',this.dateRange || [])
+    },
+    // 搜索
+    search(){
+      if(this.dateRange && this.dateRange.length>0){
+        const {dataUnit} = this
+        const [start,end] = this.dateRange
+        const startTime = new Date(start),endTime=new Date(end)
+        const timeDis= dataUnit === 3? 30 * 24 * 60 * 60 * 1000 :dataUnit === 2 ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000
+        if(endTime - startTime > timeDis){
+          this.$message.error(`时间范围不能超过${dataUnit === 3 ? '30天' : dataUnit === 2 ? '24小时' : '1小时'}`)
+        }
+      }else{
+        this.$emit('updateDate',this.dateRange || [])
+      }
+    },
+    timeLine(type){
+      if(!this.dateRange) return
+      //baseTime,maxTime 毫秒数
+      const baseTimes= this.dataUnit === 3 ? 24 * 60 * 60 * 1000 :this.dataUnit === 2 ? 60 * 60 * 1000 : 60 * 1000
+      const baseDis = this.dataUnit === 3 ? 30 :this.dataUnit === 2 ? 24 : 60
+      let baseTime = type === 'before' ? new Date(this.dateRange[0]).getTime() - baseTimes :new Date(this.dateRange[1]).getTime() + baseTimes  ,
+        maxTime = new Date(this.defaultDateRange[1]).getTime()
+      //updateTime 毫秒数
+      let updateTime = type === 'before' ? baseTime - baseDis * baseTimes : baseTime + baseDis * baseTimes
+      if(type === 'next' && updateTime >= maxTime) updateTime = maxTime
+      const start = formatDate(type === 'before' ? updateTime : baseTime,this.dataUnit !== 3)
+      const end = formatDate(type === 'before' ? baseTime : updateTime,this.dataUnit !== 3)
+      this.dateRange = [start,end]
+      this.$emit('updateDate',this.dateRange || [])
+    },
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+.time-range{
+    display: flex;
+    ::v-deep {
+        .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon{
+          line-height: 22px;
+        }
+        .el-range-editor--medium.el-input__inner{
+            height: 30px;
+        }
+        .el-range-editor--medium .el-range-separator{
+            line-height: 24px;
+        }
+        .el-button--mini{
+            padding:3px 10px;
+        }
+    }
+
+}
+</style>
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 2e4f6fe..650bff6 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -28,6 +28,13 @@
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
+        <el-form-item v-if="isDtdc" label="二级设备(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择二级设备' }]" style="width: 200px;margin-right: 50px">
+          <el-cascader
+              v-model="form.child"
+              :props="{ multiple: true }"
+              :options="childOptions"
+              @change="handleChildChange"></el-cascader>
+        </el-form-item>
         <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">
           <el-radio-group v-model="form.dataUnit">
             <el-radio :label="1">分钟</el-radio>
@@ -43,6 +50,7 @@
     <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
       <div slot="header" class="time-range-header">
         <span class="card-title"></span>
+        <date-time-select :data-unit="this.form.dataUnit" @updateDate="(val)=>form.dataRange =val"/>
       </div>
       <div style="height: 310px" id="searchChart"></div>
     </el-card>
@@ -54,26 +62,91 @@ import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import {getAllSites} from "@/api/ems/zddt";
 import {getAllDeviceCategory,getPointValueList,pointFuzzyQuery} from '@/api/ems/search'
+import DateTimeSelect from "./DateTimeSelect.vue";
 export default {
   name: "Search",
   mixins: [resize],
+  components:{DateTimeSelect},
   computed: {
+    isDtdc(){
+      return this.form.categoryName === '单体电池'
+    }
   },
   data() {
     return {
       chart: null,
       deviceCategoryList:[],//设备列表
       siteList: [],//站点列表
+      childOptions:[
+        {
+          value: '021_DDS_01',
+          label: '站点一',
+          children:[{
+            value: '1',
+            label: '1-50',
+            children:[{
+              value: '001',
+              label: '设备一'
+            },{
+              value: '002',
+              label: '设备二'
+            },{
+              value: '003',
+              label: '设备三'
+            }]
+          }]
+        },
+        {
+          value: '021_DDS_02',
+          label: '站点二',
+          children:
+            [{
+              value: '1',
+              label: '1-50',
+              children:[{
+                value: '001',
+                label: '设备一'
+              },{
+                value: '002',
+                label: '设备二'
+              }, {
+                value: '003',
+                label: '设备三'
+              }]
+            },
+            {
+              value: '2',
+              label: '51-100',
+              children:[{
+                value: '001',
+                label: '设备一'
+              },{
+                value: '002',
+                label: '设备二'
+              },{
+                value: '003',
+                label: '设备三'
+              }]
+            }]
+
+        }
+      ],//二级设备列表
       form: {
+        dataRange:[],//时间选择范围
+        child:[],
         siteIds: [],//当前选中的站点id 默认选中第一个站点
         categoryName: '',//设备
         pointName: '',//点位
-        dataUnit: '',//横坐标
+        dataUnit: 1,//横坐标
       },
       loading: false,
     }
   },
   methods: {
+    handleChildChange(data){
+      console.log('选择二级设备',data)
+      this.form.child=data
+    },
     showLoading(){
       this.chart && this.chart.showLoading()
     },
@@ -150,7 +223,6 @@ export default {
       this.form.pointName = data.value
     },
     querySearchAsync(query,cb){
-      // query = query.trim()
       console.log('查询数据',query)
       if(this.form.siteIds.length===0 || !this.form.categoryName){
         this.$message({
@@ -188,6 +260,9 @@ export default {
           if(!this.form.pointName){
             return this.$message.error('请输入正确的点位');
           }
+          if(this.isDtdc && (this.form.child.length === 0 || this.form.child.length > 5 )){
+            return this.$message.error('请选择二级设备且不能超过5个');
+          }
           this.loading = true
           const{siteIds,dataUnit,categoryName,pointName}=this.form
           getPointValueList({siteIds,dataUnit,categoryName,pointName}).then(response => {

From e7ea8c8f447533197e478127ad3eec5f41884776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Fri, 5 Sep 2025 20:37:44 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/search.js                   |   8 ++
 src/views/ems/search/DateTimeSelect.vue |  15 ++-
 src/views/ems/search/index.vue          | 167 ++++++++++++++----------
 3 files changed, 119 insertions(+), 71 deletions(-)

diff --git a/src/api/ems/search.js b/src/api/ems/search.js
index f53e504..32bd1ea 100644
--- a/src/api/ems/search.js
+++ b/src/api/ems/search.js
@@ -22,3 +22,11 @@ export function getPointValueList(data) {
     data
   })
 }
+
+// 图表
+export function getAllBatteryIdsBySites(data) {
+  return request({
+    url: `/ems/generalQuery/getAllBatteryIdsBySites/${data}`,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/src/views/ems/search/DateTimeSelect.vue b/src/views/ems/search/DateTimeSelect.vue
index 515b760..0827588 100644
--- a/src/views/ems/search/DateTimeSelect.vue
+++ b/src/views/ems/search/DateTimeSelect.vue
@@ -32,7 +32,7 @@ export default {
       return this.dataUnit === 3 ? 'daterange' : 'datetimerange'
     },
     valueFormat(){
-      return this.dataUnit === 3 ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm'
+      return this.dataUnit === 3 ? 'yyyy-MM-dd' :this.dataUnit === 2 ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd HH:mm:ss'
     },
     disabledNextBtn(){
       if(this.dateRange && this.dateRange.length ===2){
@@ -47,7 +47,14 @@ export default {
     dataUnit:{
       handler(newVal,oldVal){
         console.log('wacth到了dataUnit的变化',newVal,oldVal)
-        newVal && newVal!==oldVal && this.init()
+        this.init()
+        // if(!oldVal && newVal){
+        //   this.init()
+        // }else{
+        //   this.init()
+        //   //为了触发调用图表接口
+        //   this.$emit('updateDate',this.dateRange || [])
+        // }
       },
       immediate: true,
     }
@@ -73,7 +80,7 @@ export default {
         this.dateRange = [timeAgo, formatNow];
         this.defaultDateRange=[timeAgo, formatNow];
         console.log('init',timeAgo,formatNow)
-        this.$emit('updateDate',this.dateRange || [])
+        this.$emit('initDate',this.dateRange || [])
     },
     showBtnLoading(status){
         this.loading = status
@@ -96,6 +103,8 @@ export default {
         const timeDis= dataUnit === 3? 30 * 24 * 60 * 60 * 1000 :dataUnit === 2 ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000
         if(endTime - startTime > timeDis){
           this.$message.error(`时间范围不能超过${dataUnit === 3 ? '30天' : dataUnit === 2 ? '24小时' : '1小时'}`)
+        }else{
+          this.$emit('updateDate',this.dateRange || [])
         }
       }else{
         this.$emit('updateDate',this.dateRange || [])
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 650bff6..60c2d77 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -6,11 +6,16 @@
           prop="siteIds"
           :rules="[{ required: true, message: '请选择站点' }]"
       >
-        <el-checkbox-group v-model="form.siteIds">
-          <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
+<!--        <el-checkbox-group v-model="form.siteIds">-->
+<!--          <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId" >-->
+<!--            {{ item.siteName }}-->
+<!--          </el-checkbox>-->
+<!--        </el-checkbox-group>-->
+        <el-radio-group v-model="form.siteIds" >
+          <el-radio  v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
             {{ item.siteName }}
-          </el-checkbox>
-        </el-checkbox-group>
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="设备" prop="categoryName" :rules="[{ required: true, message: '请选择设备' }]">
         <el-radio-group v-model="form.categoryName" >
@@ -28,10 +33,11 @@
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
-        <el-form-item v-if="isDtdc" label="二级设备(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择二级设备' }]" style="width: 200px;margin-right: 50px">
+        <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="width: 200px;margin-right: 50px">
           <el-cascader
               v-model="form.child"
               :props="{ multiple: true }"
+              :show-all-levels="false"
               :options="childOptions"
               @change="handleChildChange"></el-cascader>
         </el-form-item>
@@ -50,7 +56,7 @@
     <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
       <div slot="header" class="time-range-header">
         <span class="card-title"></span>
-        <date-time-select :data-unit="this.form.dataUnit" @updateDate="(val)=>form.dataRange =val"/>
+        <date-time-select :data-unit="this.form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
       </div>
       <div style="height: 310px" id="searchChart"></div>
     </el-card>
@@ -61,7 +67,7 @@
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import {getAllSites} from "@/api/ems/zddt";
-import {getAllDeviceCategory,getPointValueList,pointFuzzyQuery} from '@/api/ems/search'
+import {getAllDeviceCategory,getPointValueList,pointFuzzyQuery,getAllBatteryIdsBySites} from '@/api/ems/search'
 import DateTimeSelect from "./DateTimeSelect.vue";
 export default {
   name: "Search",
@@ -70,71 +76,32 @@ export default {
   computed: {
     isDtdc(){
       return this.form.categoryName === '单体电池'
-    }
+    },
+  },
+  watch:{
+    'form.siteIds':{
+        handler(newVal){
+          newVal && this.isDtdc && this.getChildList()
+        }
+    },
+    isDtdc:{
+      handler(newVal){
+        newVal && this.form.siteIds && this.getChildList()
+        !newVal && (this.form.child = [])
+      }
+    },
+
   },
   data() {
     return {
       chart: null,
       deviceCategoryList:[],//设备列表
       siteList: [],//站点列表
-      childOptions:[
-        {
-          value: '021_DDS_01',
-          label: '站点一',
-          children:[{
-            value: '1',
-            label: '1-50',
-            children:[{
-              value: '001',
-              label: '设备一'
-            },{
-              value: '002',
-              label: '设备二'
-            },{
-              value: '003',
-              label: '设备三'
-            }]
-          }]
-        },
-        {
-          value: '021_DDS_02',
-          label: '站点二',
-          children:
-            [{
-              value: '1',
-              label: '1-50',
-              children:[{
-                value: '001',
-                label: '设备一'
-              },{
-                value: '002',
-                label: '设备二'
-              }, {
-                value: '003',
-                label: '设备三'
-              }]
-            },
-            {
-              value: '2',
-              label: '51-100',
-              children:[{
-                value: '001',
-                label: '设备一'
-              },{
-                value: '002',
-                label: '设备二'
-              },{
-                value: '003',
-                label: '设备三'
-              }]
-            }]
-
-        }
-      ],//二级设备列表
+      childOptions:[],//二级设备列表
       form: {
         dataRange:[],//时间选择范围
         child:[],
-        siteIds: [],//当前选中的站点id 默认选中第一个站点
+        siteIds: '',//当前选中的站点id 默认选中第一个站点
         categoryName: '',//设备
         pointName: '',//点位
         dataUnit: 1,//横坐标
@@ -143,6 +110,43 @@ export default {
     }
   },
   methods: {
+    getChildList(){
+      this.childOptions=[]
+      this.form.child=[]
+      const {siteIds} = this.form
+      getAllBatteryIdsBySites([siteIds]).then(response=>{
+        const data = response?.data || {};
+        const base = 50
+        let options = []
+        Object.entries(data).forEach(([key,value],index)=>{
+          if(!value) value  =[]
+          options.push({
+            value: key,
+            label: this.siteList.find(s=>s.siteId === key)?.siteName || '',
+            children:[]
+          })
+          const length = value.length
+          const num = Math.ceil(length /base )
+          if(num === 0) return
+          for(let i = 1; i <= num; i++){
+            const start = (i-1)*base+1,end = i*base
+            options[index].children.push({
+              value:i,
+              label: `${start}-${end}`,
+              children:[]
+            })
+            for(let s = start;s<=Math.min(length,end);s++){
+              options[index].children[i-1].children.push({
+                value:value[s-1],
+                label:value[s-1]
+              })
+            }
+          }
+        })
+        console.log('二级设备options',options)
+        this.childOptions = options;
+      })
+    },
     handleChildChange(data){
       console.log('选择二级设备',data)
       this.form.child=data
@@ -156,6 +160,10 @@ export default {
     initChart() {
       this.chart = echarts.init(document.querySelector('#searchChart'))
     },
+    updateDate(val){
+      this.form.dataRange =val || []
+      this.getDate()
+    },
     setOption(data) {
       if(!this.chart) return
       this.chart.clear()
@@ -165,7 +173,7 @@ export default {
         data.forEach((item,index)=>{
           item.deviceList.forEach(inner=>{
             dataset.push({
-              name:`${this.siteList.find(s=>s.siteId === item.siteId)?.siteName || ''}-${inner.deviceId}`,
+              name:`${this.isDtdc ? `${inner.parentDeviceId ? inner.parentDeviceId+'-' : ''}` : ''}${inner.deviceId}`,
               type:'line',
               xdata:[],
               data:[]
@@ -224,7 +232,7 @@ export default {
     },
     querySearchAsync(query,cb){
       console.log('查询数据',query)
-      if(this.form.siteIds.length===0 || !this.form.categoryName){
+      if(!this.form.siteIds || !this.form.categoryName){
         this.$message({
           type: 'warning',
           message: '请先选择站点和设备',
@@ -232,7 +240,7 @@ export default {
         return cb([])
       }
       pointFuzzyQuery({
-        siteIds:this.form.siteIds,
+        siteIds:[this.form.siteIds],
         categoryName:this.form.categoryName,
         pointName:query,
       }).then(response => {
@@ -264,8 +272,31 @@ export default {
             return this.$message.error('请选择二级设备且不能超过5个');
           }
           this.loading = true
-          const{siteIds,dataUnit,categoryName,pointName}=this.form
-          getPointValueList({siteIds,dataUnit,categoryName,pointName}).then(response => {
+          const{siteIds,dataUnit,categoryName,pointName,dataRange:[start='',end=''],child}=this.form
+          let siteDeviceMap={}
+          child.forEach(([first,second,third])=>{
+             if(siteDeviceMap[first]){
+               siteDeviceMap[first].push(third)
+             }else{
+               siteDeviceMap[first]=[]
+               siteDeviceMap[first].push(third)
+             }
+          })
+          let startDate,endDate
+          if(start && dataUnit===3){
+            // startDate= start + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
+            startDate = start + ' 00:00:00'
+          }else{
+            startDate=start
+          }
+          if(end && dataUnit===3){
+            // endDate= end + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
+            endDate = end + ' 00:00:00'
+          }else{
+            endDate=end
+          }
+
+          getPointValueList({siteIds:[siteIds],dataUnit,categoryName,pointName,startDate,endDate,siteDeviceMap}).then(response => {
             this.setOption(response?.data || [])
           }).finally(()=>{
             this.loading = false

From 2742f874ce3082d16e65a2080e145aa8a743e650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Fri, 5 Sep 2025 20:50:27 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/search/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 60c2d77..aecbbed 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -25,17 +25,19 @@
         </el-radio-group>
       </el-form-item>
       <div style="display: flex">
-        <el-form-item label="点位" prop="pointName"  :rules="[{ required: true, message: '请输入点位' }]" style="width: 200px;margin-right: 50px">
+        <el-form-item label="点位" prop="pointName"  :rules="[{ required: true, message: '请输入点位' }]" style="margin-right: 50px">
           <el-autocomplete
               v-model="form.pointName"
               placeholder="请输入点位"
+              clearable
               :fetch-suggestions="querySearchAsync"
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
-        <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="width: 200px;margin-right: 50px">
+        <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="margin-right: 50px">
           <el-cascader
               v-model="form.child"
+              style="width:230px"
               :props="{ multiple: true }"
               :show-all-levels="false"
               :options="childOptions"
@@ -269,7 +271,7 @@ export default {
             return this.$message.error('请输入正确的点位');
           }
           if(this.isDtdc && (this.form.child.length === 0 || this.form.child.length > 5 )){
-            return this.$message.error('请选择二级设备且不能超过5个');
+            return this.$message.error('请选择单体电池且不能超过5个');
           }
           this.loading = true
           const{siteIds,dataUnit,categoryName,pointName,dataRange:[start='',end=''],child}=this.form

From cc3164a423e316f90a31e610639efe6e36b1672c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:01:48 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Ems/DateRangeSelect/index.vue | 4 ++--
 src/components/Ems/ZdSelect/index.vue        | 8 ++++----
 src/views/ems/dzjk/home/ActiveChart.vue      | 2 +-
 src/views/ems/dzjk/home/WeekChart.vue        | 4 ++--
 src/views/ems/dzjk/home/index.vue            | 2 +-
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue     | 4 ++--
 src/views/ems/search/index.vue               | 6 +++---
 src/views/ems/site/sblb/index.vue            | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/Ems/DateRangeSelect/index.vue b/src/components/Ems/DateRangeSelect/index.vue
index 10196c2..fb026df 100644
--- a/src/components/Ems/DateRangeSelect/index.vue
+++ b/src/components/Ems/DateRangeSelect/index.vue
@@ -38,9 +38,9 @@ export default {
     }
   },
   methods: {
-    init(){
+    init(today=false){
         const now = new Date(),formatNow = formatDate(now);
-        const weekAgo = formatDate(new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
+        const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
         this.dateRange = [weekAgo, formatNow];
         this.defaultDateRange=[weekAgo, formatNow];
         this.$emit('updateDate',this.dateRange)
diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue
index 83e85cc..bfe869f 100644
--- a/src/components/Ems/ZdSelect/index.vue
+++ b/src/components/Ems/ZdSelect/index.vue
@@ -3,13 +3,13 @@
   <div class="zd-select-container">
     <el-form :inline="true">
       <el-form-item label="站点选择">
-        <el-select v-model="id" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="id" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSubmit">
           <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :loading="searchLoading" @click="onSubmit">搜索</el-button>
-      </el-form-item>
+<!--      <el-form-item>-->
+<!--        <el-button type="primary" :loading="searchLoading" @click="onSubmit">搜索</el-button>-->
+<!--      </el-form-item>-->
     </el-form>
   </div>
 </template>
diff --git a/src/views/ems/dzjk/home/ActiveChart.vue b/src/views/ems/dzjk/home/ActiveChart.vue
index 0b4eca4..1d768a0 100644
--- a/src/views/ems/dzjk/home/ActiveChart.vue
+++ b/src/views/ems/dzjk/home/ActiveChart.vue
@@ -57,7 +57,7 @@ export default {
       this.siteId = siteId
       this.timeRange=[]
       this.deviceId=''
-      this.$refs.dateRangeSelect.init()
+      this.$refs.dateRangeSelect.init(true)
       this.showLoading()
       getPcsNameList(siteId).then(response=>{
         const data=response?.data || [];
diff --git a/src/views/ems/dzjk/home/WeekChart.vue b/src/views/ems/dzjk/home/WeekChart.vue
index 486f5e8..1cd685f 100644
--- a/src/views/ems/dzjk/home/WeekChart.vue
+++ b/src/views/ems/dzjk/home/WeekChart.vue
@@ -107,11 +107,11 @@ export default {
         series: [
           {
             yAxisIndex:0,
-            type: 'line',
+            type: 'bar',
           },
           {
             yAxisIndex:0,
-            type: 'line',
+            type: 'bar',
           },
         ]
       })
diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index 9398a11..e500155 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -10,7 +10,7 @@
           class="common-card-container common-card-container-body-no-padding"
         >
           <div slot="header">
-            <span class="card-title">静态信息</span>
+            <span class="card-title">站点信息</span>
           </div>
           <div
             style="box-sizing: border-box; height: 250px; padding: 20px 15px"
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 16584bc..8653293 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -4,7 +4,7 @@
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
       <el-card shadow="always" class="common-card-container common-card-container-body-no-padding common-card-container-no-title-bg">
         <div slot="header">
-          <span class="large-title">{{index+1}}#{{baseInfo.deviceName}}</span>
+          <span class="large-title">{{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} -> ` : ''}}{{baseInfo.deviceName}}</span>
         </div>
           <div class="descriptions-main">
             <el-descriptions direction="vertical" :column="3" :colon="false">
@@ -20,7 +20,7 @@
             <!--        进度-->
             <div class="process-container">
               <div class="process-line-bg">
-                <div class="process-line":style="{height:baseInfo.currentSoc+'%'}"></div>
+                <div class="process-line" :style="{height:baseInfo.currentSoc+'%'}"></div>
               </div>
               <div class="process">当前SOC :  {{baseInfo.currentSoc}}%</div>
             </div>
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index aecbbed..62c2c86 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -60,7 +60,7 @@
         <span class="card-title"></span>
         <date-time-select :data-unit="this.form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
       </div>
-      <div style="height: 310px" id="searchChart"></div>
+      <div style="height: 350px" id="searchChart"></div>
     </el-card>
   </div>
 </template>
@@ -193,8 +193,8 @@ export default {
       console.log('图表数据',dataset)
       this.chart.setOption({
         legend: {
-          left: 'center',
-          top: '10',
+          // left: 'center',
+          // top: '10',
         },
         grid: {
           containLabel: true
diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue
index 597ef95..1823343 100644
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@@ -3,12 +3,12 @@
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
         <el-form-item label="站点选择">
-          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据">
+          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSearch">
             <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
           </el-select>
         </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+<!--        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>-->
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
     </el-form>

From f16b92582cc0a1ce2d36e579fe85ea07303a7b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 9 Sep 2025 17:51:52 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/ems/intervalUpdate.js       | 24 ++++++++++++++++++++++++
 src/views/ems/dzjk/sbjk/pcs/index.vue  |  9 +++++++--
 src/views/ems/dzjk/sbjk/ssyx/index.vue | 16 ++++++++++------
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/mixins/ems/intervalUpdate.js

diff --git a/src/mixins/ems/intervalUpdate.js b/src/mixins/ems/intervalUpdate.js
new file mode 100644
index 0000000..774f221
--- /dev/null
+++ b/src/mixins/ems/intervalUpdate.js
@@ -0,0 +1,24 @@
+// 定时刷新
+const intervalUpdate=  {
+    data: function () {
+        return {
+            intervalUpdateTimer:null
+        }
+    },
+    beforeDestroy() {
+        console.log('销毁之前 清空定时器')
+        if( this.intervalUpdateTimer) {
+            window.clearInterval(this.intervalUpdateTimer)
+            this.intervalUpdateTimer = null
+        }
+    },
+    methods:{
+        updateInterval: function (cn,time=10000) {
+            window.clearInterval(this.intervalUpdateTimer)
+            this.intervalUpdateTimer = null
+            this.intervalUpdateTimer = window.setInterval(cn,time)
+        }
+    }
+
+}
+export default intervalUpdate
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index 70bf861..d222055 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -51,10 +51,11 @@
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getRunningHeadInfo,getPcsDetailInfo} from '@/api/ems/dzjk'
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkPcs',
   components:{RealTimeBaseInfo},
-  mixins:[getQuerySiteId],
+  mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       loading:false,
@@ -150,9 +151,13 @@ export default {
         this.pcsList = JSON.parse(JSON.stringify(data))
       }).finally(()=>this.loading = false)
     },
-    init(){
+    updateData(){
       this.getRunningHeadData()
       this.getPcsList()
+    },
+    init(){
+      this.updateData()
+      this.updateInterval(this.updateData,5000)
     }
   },
 
diff --git a/src/views/ems/dzjk/sbjk/ssyx/index.vue b/src/views/ems/dzjk/sbjk/ssyx/index.vue
index c862ef8..54bce5b 100644
--- a/src/views/ems/dzjk/sbjk/ssyx/index.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/index.vue
@@ -34,11 +34,12 @@ import DcpjwdChart from './DcpjwdChart.vue'
 import DcpjsocChart from './DcpjsocChart.vue'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getRunningHeadInfo} from '@/api/ems/dzjk'
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
   name:'DzjkSbjkSsyx',
   components:{RealTimeBaseInfo,CnglqxChart,PocpjwdChart,DcpjwdChart,DcpjsocChart},
-  mixins:[getQuerySiteId],
+  mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       runningHeadData:{},//运行信息
@@ -51,15 +52,18 @@ export default {
         this.runningHeadData = response?.data || {}
       })
     },
+    updateData(){
+      this.$refs.cnglqx.init(this.siteId)
+      this.$refs.pocpjwd.init(this.siteId)
+      this.$refs.dcpjsoc.init(this.siteId)
+      this.$refs.dcpjwd.init(this.siteId)
+    },
     init(){
       this.getRunningHeadData()
       this.$nextTick(()=>{
-        this.$refs.cnglqx.init(this.siteId)
-        this.$refs.pocpjwd.init(this.siteId)
-        this.$refs.dcpjsoc.init(this.siteId)
-        this.$refs.dcpjwd.init(this.siteId)
+        this.updateData()
+        this.updateInterval(this.updateData)
       })
-
     }
   }
 

From ae1c2a5d6ce55b383832aaf59d344338a1dca193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:54:29 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue | 10 ++--
 src/views/ems/dzjk/sbjk/bmszl/index.vue  | 11 +++--
 src/views/ems/dzjk/sbjk/db/index.vue     | 61 ++++++++++++++----------
 src/views/ems/dzjk/sbjk/pcs/index.vue    |  2 +-
 src/views/ems/dzjk/sbjk/yl/index.vue     | 25 +++++++---
 5 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 8653293..028b47e 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -69,9 +69,10 @@
 <script>
 import {getBMSBatteryCluster} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkBmsdcc',
-  mixins:[getQuerySiteId],
+  mixins:[getQuerySiteId,intervalUpdate],
   components:{},
   data() {
     return {
@@ -96,12 +97,15 @@ export default {
     }
   },
   methods:{
-    init(){
+    updateData(){
       this.loading = true
       getBMSBatteryCluster(this.siteId).then(response => {
         this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
       }).finally(() => {this.loading = false})
-
+    },
+    init(){
+      this.updateData()
+      this.updateInterval(this.updateData)
     }
   }
 }
diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue
index ddeff94..07e5ab5 100644
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@@ -108,9 +108,10 @@
 <script>
 import {getBMSOverView} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkBmszl',
-  mixins:[getQuerySiteId],
+  mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       loading:false,
@@ -129,11 +130,15 @@ export default {
     }
   },
   methods:{
-    init(){
-      this.loading=true;
+    updateData(){
+      this.loading = true
       getBMSOverView(this.siteId).then(response => {
         this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
       }).finally(() => {this.loading = false})
+    },
+    init(){
+      this.updateData()
+      this.updateInterval(this.updateData)
     }
 
   }
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index e94f677..f5945d0 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -3,11 +3,10 @@
     <el-card
       shadow="always"
       class="common-card-container"
-      :class="
-        zbInfo.emsCommunicationStatus !== '0'
-          ? 'zb-common-card-container'
-          : 'cnb-common-card-container'
-      "
+      :class="{
+        'zb-common-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
+        'cnb-common-card-container':zbInfo.emsCommunicationStatus === '0'
+      }"
     >
       <div slot="header">
         <span class="large-title">1#{{ zbInfo.deviceName }}</span>
@@ -40,11 +39,10 @@
       shadow="always"
       class="common-card-container"
       style="margin-top: 20px"
-      :class="
-        cnbInfo.emsCommunicationStatus !== '0'
-          ? 'zb-common-card-container'
-          : 'cnb-common-card-container'
-      "
+      :class="{
+        'zb-common-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
+        'cnb-common-card-container':zbInfo.emsCommunicationStatus === '0'
+      }"
     >
       <div slot="header">
         <span class="large-title">2#{{ cnbInfo.deviceName }}</span>
@@ -77,9 +75,10 @@
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { getAmmeterDataList } from "@/api/ems/dzjk";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name: "DzjkSbjkDb",
-  mixins: [getQuerySiteId],
+  mixins: [getQuerySiteId,intervalUpdate],
   data() {
     return {
       loading: false,
@@ -88,20 +87,24 @@ export default {
     };
   },
   methods: {
-    init() {
+    updateData(){
       this.loading = true;
       getAmmeterDataList(this.siteId)
-        .then((response) => {
-          this.zbInfo = JSON.parse(
-            JSON.stringify(response?.data?.ammeterLoadData || {})
-          );
-          this.cnbInfo = JSON.parse(
-            JSON.stringify(response?.data?.ammeterMeteData || {})
-          );
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+          .then((response) => {
+            this.zbInfo = JSON.parse(
+                JSON.stringify(response?.data?.ammeterLoadData || {})
+            );
+            this.cnbInfo = JSON.parse(
+                JSON.stringify(response?.data?.ammeterMeteData || {})
+            );
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+    },
+    init() {
+      this.updateData()
+      this.updateInterval(this.updateData)
     },
   },
   mounted() {},
@@ -109,17 +112,23 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.zb-common-card-container,
-.cnb-common-card-container {
+.common-card-container {
   ::v-deep {
     .el-card__header {
+      background-color: transparent;
       padding: 10px 14px;
-      background-color: #fc6b69;
       color: #ffffff;
       position: relative;
     }
   }
 }
+.zb-common-card-container{
+  ::v-deep {
+    .el-card__header {
+      background-color: #fc6b69;
+    }
+  }
+}
 .cnb-common-card-container {
   margin-top: 25px;
   ::v-deep {
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index d222055..ba2db6d 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -157,7 +157,7 @@ export default {
     },
     init(){
       this.updateData()
-      this.updateInterval(this.updateData,5000)
+      this.updateInterval(this.updateData)
     }
   },
 
diff --git a/src/views/ems/dzjk/sbjk/yl/index.vue b/src/views/ems/dzjk/sbjk/yl/index.vue
index 51323e0..1c07198 100644
--- a/src/views/ems/dzjk/sbjk/yl/index.vue
+++ b/src/views/ems/dzjk/sbjk/yl/index.vue
@@ -1,7 +1,7 @@
 
 <template>
     <div v-loading="loading">
-      <div class="yl-item-container" :class="{'yl-warn-item-container':item.workMode !== '0'}" v-for="(item,index) in list" :key="index+'ylLise'">
+      <div class="yl-item-container" :class="{'yl-warn-item-container':item.workMode !== '0','yl-normal-item-container':item.workMode === '0'}" v-for="(item,index) in list" :key="index+'ylLise'">
         <div class="header">
           <div class="header-title">{{item.systemName}}</div>
           <div>工作模式：<span class="header-values">{{$store.state.ems.workModeOptions[item.workMode]}}</span></div>
@@ -21,9 +21,10 @@
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getCoolingDataList} from '@/api/ems/dzjk'
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkYl',
-  mixins:[getQuerySiteId],
+  mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       loading:false,
@@ -40,11 +41,15 @@ export default {
     }
   },
   methods:{
-    init(){
+    updateData(){
       this.loading = true
       getCoolingDataList(this.siteId).then(response => {
         this.list =  JSON.parse(JSON.stringify(response?.data || []));
       }).finally(() => {this.loading = false})
+    },
+    init(){
+      this.updateData()
+      this.updateInterval(this.updateData)
     }
   },
   mounted(){
@@ -56,7 +61,6 @@ export default {
 <style scoped lang="scss">
 .yl-item-container{
   border-radius: 5px;
-  background-color: #EBF6F6;
   &:not(:last-child){
     margin-bottom: 25px;
   }
@@ -73,11 +77,9 @@ export default {
       width: 120px;
       height: 40px;
       font-size: 16px;
-      background-color: #05AEA3;
       text-align: center;
     }
     .header-values{
-      color: #05AEA3;
       font-weight: 500;
     }
   }
@@ -113,5 +115,16 @@ export default {
     }
   }
 }
+.yl-normal-item-container{
+  background-color: #EBF6F6;
+  .header{
+    .header-title{
+      background-color: #05AEA3;
+    }
+    .header-values{
+      color: #05AEA3;
+    }
+  }
+}
 
 </style>

From ba4df3217610b5a6fc735296a77da33d6f928214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:56:22 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/sbjk/db/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index f5945d0..75c6c50 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -130,7 +130,6 @@ export default {
   }
 }
 .cnb-common-card-container {
-  margin-top: 25px;
   ::v-deep {
     .el-card__header {
       background-color: #05aea3;

From f0054487058179c9721e43c7e338231b5e944a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Wed, 10 Sep 2025 14:25:00 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/ems/intervalUpdate.js |  2 +-
 src/views/ems/search/index.vue   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mixins/ems/intervalUpdate.js b/src/mixins/ems/intervalUpdate.js
index 774f221..d83a85c 100644
--- a/src/mixins/ems/intervalUpdate.js
+++ b/src/mixins/ems/intervalUpdate.js
@@ -13,7 +13,7 @@ const intervalUpdate=  {
         }
     },
     methods:{
-        updateInterval: function (cn,time=10000) {
+        updateInterval: function (cn,time=60000) {
             window.clearInterval(this.intervalUpdateTimer)
             this.intervalUpdateTimer = null
             this.intervalUpdateTimer = window.setInterval(cn,time)
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 62c2c86..13de9df 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -24,6 +24,15 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]">
+        <el-cascader
+            v-model="form.child"
+            style="width:400px"
+            :props="{ multiple: true }"
+            :show-all-levels="false"
+            :options="childOptions"
+            @change="handleChildChange"></el-cascader>
+      </el-form-item>
       <div style="display: flex">
         <el-form-item label="点位" prop="pointName"  :rules="[{ required: true, message: '请输入点位' }]" style="margin-right: 50px">
           <el-autocomplete
@@ -34,15 +43,6 @@
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
-        <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]" style="margin-right: 50px">
-          <el-cascader
-              v-model="form.child"
-              style="width:230px"
-              :props="{ multiple: true }"
-              :show-all-levels="false"
-              :options="childOptions"
-              @change="handleChildChange"></el-cascader>
-        </el-form-item>
         <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">
           <el-radio-group v-model="form.dataUnit">
             <el-radio :label="1">分钟</el-radio>

From c51baa166bb801f38a2399950b637c8068c3721f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sat, 13 Sep 2025 14:47:37 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=80=BB=E5=85=85=E7=94=B5=E9=87=8F=E3=80=81=E6=80=BB=E6=94=BE?=
 =?UTF-8?q?=E7=94=B5=E9=87=8F=E5=8D=95=E4=BD=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/home/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index e500155..f9bb0c1 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -102,11 +102,11 @@ export default {
       ],
       sjglData: [
         {
-          title: "今日充电量（MWh）",
+          title: "今日充电量（kWh）",
           attr: "dayChargedCap",
         },
         {
-          title: "今日放电量（MWh）",
+          title: "今日放电量（kWh）",
           attr: "dayDisChargedCap",
         },
         {

From b61a202267d5266dc31e3082f8949b0a546929bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sat, 13 Sep 2025 14:58:42 +0800
Subject: [PATCH 13/20] =?UTF-8?q?['#4472c4','#70ad47'],//=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=85=85=E6=94=BE=E7=94=B5=E9=A2=9C=E8=89=B2=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/home/WeekChart.vue | 2 +-
 src/views/ems/dzjk/tjbb/gltj/Dlzb.vue | 5 ++++-
 src/views/ems/zddt/BarChart.vue       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/ems/dzjk/home/WeekChart.vue b/src/views/ems/dzjk/home/WeekChart.vue
index 1cd685f..acd0685 100644
--- a/src/views/ems/dzjk/home/WeekChart.vue
+++ b/src/views/ems/dzjk/home/WeekChart.vue
@@ -72,7 +72,7 @@ export default {
         source.push([item.ammeterDate, item.chargedCap,item.disChargedCap])
       })
       this.chart && this.chart.setOption({
-        color:['#FFBD00','#3C81FF','#05AEA3'],
+        color:['#4472c4','#70ad47'],//所有充放电颜色保持统一
         tooltip: {
           trigger: 'axis',
           axisPointer: { // 坐标轴指示器，坐标轴触发有效
diff --git a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
index dee45ae..8731f61 100644
--- a/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
+++ b/src/views/ems/dzjk/tjbb/gltj/Dlzb.vue
@@ -72,7 +72,6 @@ export default {
         source.push([item.ammeterDate, item.chargedCap,item.disChargedCap,item.dailyEfficiency])
       })
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF','#05AEA3'],
         legend: {
           left: 'center',
           bottom: '15',
@@ -110,18 +109,22 @@ export default {
         dataset:{
           source
         },
+        //所有充放电颜色保持统一
         series: [
           {
             yAxisIndex:0,
             type: 'bar',//柱状图
+            color:'#4472c4'
           },
           {
             yAxisIndex:0,
             type: 'bar',//柱状图
+            color:'#70ad47'
           },
           {
             yAxisIndex:1,
             type: 'line',//柱状图
+            color:'#FFBD00'
           },
         ]
       })
diff --git a/src/views/ems/zddt/BarChart.vue b/src/views/ems/zddt/BarChart.vue
index e893c44..2e03973 100644
--- a/src/views/ems/zddt/BarChart.vue
+++ b/src/views/ems/zddt/BarChart.vue
@@ -32,7 +32,7 @@ export default {
         source.push([item.ammeterDate, item.chargedCap,item.disChargedCap])
       })
       this.chart.setOption({
-        color:['#A796FF','#FFBE01'],
+        color:['#4472c4','#70ad47'],//所有充放电颜色保持统一
         grid: {
           top:30,
           containLabel: true

From 4c31eeb837b4d3be3389276d0cc6d3f716ba30b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sat, 13 Sep 2025 20:36:46 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/common.scss            |  21 +++
 src/views/ems/dzjk/home/index.vue        |  16 --
 src/views/ems/dzjk/sbjk/PointChart.vue   | 221 +++++++++++++++++++++++
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue |  54 ++++--
 src/views/ems/dzjk/sbjk/bmszl/index.vue  |  48 +++--
 src/views/ems/dzjk/sbjk/db/index.vue     |  30 +++
 src/views/ems/dzjk/sbjk/pcs/index.vue    | 113 ++++--------
 src/views/ems/search/DateTimeSelect.vue  |  18 +-
 src/views/ems/search/index.vue           |  41 +++--
 9 files changed, 408 insertions(+), 154 deletions(-)
 create mode 100644 src/views/ems/dzjk/sbjk/PointChart.vue

diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss
index fdfc88f..7a7d78a 100644
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@@ -50,6 +50,27 @@
       background-color: transparent;
     }
 }
+/* card标题里的时间选择器 */
+.time-range-card {
+  &.common-card-container .el-card__header {
+    padding-top: 0;
+    padding-bottom: 0;
+    .time-range-header {
+      height: 40px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .card-title {
+        line-height: 40px;
+      }
+    }
+  }
+}
+
+
+
+
+
 //描述样式 PCS、BMS总览、BMS电池簇页面公共样式
 .descriptions-main{
   padding:24px;
diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index f9bb0c1..0a8699a 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -199,20 +199,4 @@ export default {
     }
   }
 }
-/* card标题里的时间选择器 */
-.time-range-card {
-  &.common-card-container .el-card__header {
-    padding-top: 0;
-    padding-bottom: 0;
-    .time-range-header {
-      height: 40px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .card-title {
-        line-height: 40px;
-      }
-    }
-  }
-}
 </style>
diff --git a/src/views/ems/dzjk/sbjk/PointChart.vue b/src/views/ems/dzjk/sbjk/PointChart.vue
new file mode 100644
index 0000000..dcef16a
--- /dev/null
+++ b/src/views/ems/dzjk/sbjk/PointChart.vue
@@ -0,0 +1,221 @@
+<!--电位展示图表-->
+<template>
+  <el-dialog
+      :visible.sync="show"
+      :title="pointName"
+      :close-on-click-modal="false"
+      show-close
+      destroy-on-close
+      lock-scroll
+      append-to-body
+      width="1000px"
+      class="ems-dialog"
+      :before-close="handleColsed"
+  >
+    <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+      <div slot="header" class="time-range-header">
+        <el-radio-group class="card-title" v-model="dataUnit">
+          <el-radio :label="1">分钟</el-radio>
+          <el-radio :label="2">小时</el-radio>
+          <el-radio :label="3">天</el-radio>
+        </el-radio-group>
+        <date-time-select ref="dateTimeSelect" :data-unit="dataUnit" @initDate="((e)=>dataRange=e||[])" @updateDate="updateDate"/>
+      </div>
+      <div style="height: 350px" id="searchChart"></div>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
+import DateTimeSelect from "@/views/ems/search/DateTimeSelect.vue";
+import {getPointValueList} from "@/api/ems/search";
+import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+export default {
+  components: {DateRangeSelect, DateTimeSelect},
+  mixins: [resize],
+  props: {
+    siteId:{
+      type: String,
+      required: true,
+    }
+  },
+  computed: {
+    isDtdc(){
+      return this.categoryName === '单体电池'
+    },
+  },
+  watch:{
+    show(val) {
+      if(!val){
+        this.pointName=''
+        this.categoryName=''
+        this.deviceId=''
+        this.dataUnit=1
+        if (!this.chart) {
+          return
+        }
+        this.hideLoading()
+        this.chart.dispose()
+        this.chart = null
+      }
+    },
+    dataUnit:{
+      handler(newVal,oldVal){
+        console.log('wacth到了dataUnit的变化',newVal,oldVal)
+        this.$nextTick(()=>{
+          this.$refs.dateTimeSelect.init()
+          this.getDate()
+        })
+      },
+    }
+  },
+  data(){
+    return{
+      show:false,
+      chart:null,
+      dataUnit:1,
+      dataRange:[],
+      child:[],//单体电池需要数据 暂不删除
+      pointName:'',
+      categoryName:'',
+      deviceId:''
+    }
+  },
+  methods:{
+    showChart({pointName,categoryName,deviceId}){
+      //初始化数据
+      this.pointName=pointName
+      this.categoryName=categoryName
+      this.deviceId=deviceId
+      this.show = true
+      this.$nextTick(()=>{
+        this.$refs.dateTimeSelect.init()
+        this.initChart()
+        this.getDate()
+      })
+    },
+    initChart() {
+      this.chart = echarts.init(document.querySelector('#searchChart'))
+    },
+    showLoading(){
+      this.chart && this.chart.showLoading()
+    },
+    hideLoading(){
+      this.chart && this.chart.hideLoading()
+    },
+    getDate(){
+        this.showLoading()
+        const{dataUnit,dataRange:[start='',end=''],child}=this
+        let siteDeviceMap={}
+        child.forEach(([first,second,third])=>{
+          if(siteDeviceMap[first]){
+            siteDeviceMap[first].push(third)
+          }else{
+            siteDeviceMap[first]=[]
+            siteDeviceMap[first].push(third)
+          }
+        })
+        let startDate,endDate
+        if(start && dataUnit===3){
+          // startDate= start + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
+          startDate = start + ' 00:00:00'
+        }else{
+          startDate=start
+        }
+        if(end && dataUnit===3){
+          // endDate= end + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
+          endDate = end + ' 00:00:00'
+        }else{
+          endDate=end
+        }
+
+        getPointValueList({siteIds:[this.siteId],dataUnit,categoryName:this.categoryName,pointName:this.pointName,startDate,endDate,siteDeviceMap:{}}).then(response => {
+          this.setOption(response?.data || [])
+        }).finally(()=>{
+          this.hideLoading()
+        })
+    },
+    setOption(data) {
+      if(!this.chart) return
+      this.chart.clear()
+      console.log('返回的数据',data)
+      let dataset=[]
+      if(data.length>0){
+        data.forEach((item,index)=>{
+          item.deviceList.forEach(inner=>{
+            dataset.push({
+              name:`${this.isDtdc ? `${inner.parentDeviceId ? inner.parentDeviceId+'-' : ''}` : ''}${inner.deviceId}`,
+              type:'line',
+              xdata:[],
+              data:[]
+            })
+            const length = dataset.length
+            inner.pointValueList.forEach(value=>{
+              dataset[length-1].xdata.push(value.valueDate)
+              dataset[length-1].data.push(value.pointValue)
+            })
+          })
+        })
+      }else{
+        this.$message.warning('暂无数据')
+      }
+      console.log('图表数据',dataset)
+      this.chart.setOption({
+        legend: {
+          // left: 'center',
+          // top: '10',
+        },
+        grid: {
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        textStyle:{
+          color:"#333333",
+        },
+        xAxis: {type:'category',data:dataset?.[0]?.xdata || []},
+        yAxis: {
+          type: 'value',
+        },
+        dataZoom: [
+          {
+            type: 'inside',
+            start: 0,
+            end: 100
+          },
+          {
+            start: 0,
+            end: 100
+          }
+        ],
+        series: dataset
+      })
+    },
+    updateDate(val){
+      this.dataRange =val || []
+      this.getDate()
+    },
+    handleColsed(done) {
+      if (!this.chart) {
+        return done();
+      }
+      this.chart.dispose();
+      this.chart = null;
+      done();
+    },
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep {
+ .card-title .el-radio{
+    line-height: 40px;
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 028b47e..3134f57 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -15,14 +15,18 @@
           </div>
           <div class="descriptions-main descriptions-main-bg-color">
             <el-descriptions direction="vertical" :column="3" :colon="false">
-              <el-descriptions-item  labelClassName="descriptions-label" contentClassName="descriptions-direction" v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">{{baseInfo[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span></el-descriptions-item>
+              <el-descriptions-item  labelClassName="descriptions-label" contentClassName="descriptions-direction" v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
+                <span class="pointer" @click="showChart(item.pointName || '','电池簇',baseInfo.deviceId)">
+                {{baseInfo[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span>
+              </span>
+              </el-descriptions-item>
             </el-descriptions>
             <!--        进度-->
             <div class="process-container">
               <div class="process-line-bg">
                 <div class="process-line" :style="{height:baseInfo.currentSoc+'%'}"></div>
               </div>
-              <div class="process">当前SOC :  {{baseInfo.currentSoc}}%</div>
+              <div class="process pointer" @click="showChart( '当前SOC','电池簇',baseInfo.deviceId)">当前SOC :  {{baseInfo.currentSoc}}%</div>
             </div>
           </div>
         <el-table
@@ -41,10 +45,16 @@
             prop="avgData"
             label="单体平均值"
           >
+            <template slot-scope="scope">
+              <span class="pointer" @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.avgData}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="minData"
             label="单体最小值">
+            <template slot-scope="scope">
+              <span class="pointer" @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.minData}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="minDataID"
@@ -53,6 +63,9 @@
           <el-table-column
             prop="maxData"
             label="单体最大值">
+            <template slot-scope="scope">
+              <span class="pointe " @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.maxData}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="maxDataID"
@@ -62,18 +75,20 @@
       </el-card>
     </div>
     <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
+    <point-chart ref="pointChart" :site-id="siteId"/>
   </div>
 
 </template>
 
 <script>
+import pointChart from "./../PointChart.vue";
 import {getBMSBatteryCluster} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkBmsdcc',
   mixins:[getQuerySiteId,intervalUpdate],
-  components:{},
+  components:{pointChart},
   data() {
     return {
       loading:false,
@@ -82,21 +97,36 @@ export default {
         '温度':'&#8451;',
         'SOC':'%'
       },
+      tablePointNameMap:{
+        '电压单体最小值':'最低单体电压',
+        '电压单体平均值':'电压平均值',
+        '电压单体最大值':'最高单体电压',
+        '温度单体最小值':'最低单体温度',
+        '温度单体平均值':'温度平均值',
+        '温度单体最大值':'最高单体温度',
+        'SOC单体最小值':'最低单体SOC',
+        'SOC单体平均值':'',
+        'SOC单体最大值':'最高单体SOC',
+      },
       baseInfoList:[],
       infoData:[
-        {label:'簇电压',attr:'clusterVoltage',unit:'V'},
-        {label:'可充电量',attr:'chargeableCapacity',unit:'kWh'},
-        {label:'累计充电量',attr:'totalChargedCapacity',unit:'kWh'},
-        {label:'簇电流',attr:'clusterCurrent',unit:'A'},
-        {label:'可放电量',attr:'dischargeableCapacity',unit:'kWh'},
-        {label:'累计放电量',attr:'totalDischargedCapacity',unit:'kWh'},
-        {label:'SOH',attr:'soh',unit:'%'},
-        {label:'平均温度',attr:'averageTemperature',unit:'&#8451;'},
-        {label:'绝缘电阻',attr:'insulationResistance',unit:'&Omega;'},
+        {label:'簇电压',attr:'clusterVoltage',unit:'V',pointName:'簇电压'},
+        {label:'可充电量',attr:'chargeableCapacity',unit:'kWh',pointName:'可充电量'},
+        {label:'累计充电量',attr:'totalChargedCapacity',unit:'kWh',pointName:'累计充电量'},
+        {label:'簇电流',attr:'clusterCurrent',unit:'A',pointName:'簇电流'},
+        {label:'可放电量',attr:'dischargeableCapacity',unit:'kWh',pointName:'可放电量'},
+        {label:'累计放电量',attr:'totalDischargedCapacity',unit:'kWh',pointName:'累计放电量'},
+        {label:'SOH',attr:'soh',unit:'%',pointName:'SOH'},
+        {label:'平均温度',attr:'averageTemperature',unit:'&#8451;',pointName:'平均温度'},
+        {label:'绝缘电阻',attr:'insulationResistance',unit:'&Omega;',pointName:'绝缘电阻'},
       ],
     }
   },
   methods:{
+    showChart(pointName,categoryName,deviceId){
+      console.log('点击查询图表',pointName,categoryName,deviceId)
+      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    },
     updateData(){
       this.loading = true
       getBMSBatteryCluster(this.siteId).then(response => {
diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue
index 07e5ab5..c3466b2 100644
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@@ -15,14 +15,18 @@
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
           <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item  labelClassName="descriptions-label" contentClassName="descriptions-direction" v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">{{baseInfo[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span></el-descriptions-item>
+            <el-descriptions-item  labelClassName="descriptions-label" contentClassName="descriptions-direction" v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
+              <span  class="pointer" @click="showChart(item.pointName || '','电池堆',baseInfo.deviceId)">
+                {{baseInfo[item.attr] | formatNumber}}<span v-if="item.unit" v-html="item.unit"></span>
+              </span>
+            </el-descriptions-item>
           </el-descriptions>
           <!--        进度-->
           <div class="process-container">
             <div class="process-line-bg">
               <div class="process-line" :style="{height:baseInfo.stackSoc+'%'}"></div>
             </div>
-            <div class="process">当前SOC : {{baseInfo.stackSoc}}%</div>
+            <div class="process pointer" @click="showChart('当前SOC','电池堆',baseInfo.deviceId)">当前SOC : {{baseInfo.stackSoc}}%</div>
           </div>
         </div>
         <el-table
@@ -39,26 +43,26 @@
             label="簇电压"
           >
             <template slot-scope="scope">
-              <span>{{scope.row.clusterVoltage}} V</span>
+              <span class="pointer" @click="showChart('簇电压','电池簇',scope.row.clusterId)">{{scope.row.clusterVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
             label="簇电流">
             <template slot-scope="scope">
-              <span>{{scope.row.clusterCurrent}} A</span>
+              <span class="pointer" @click="showChart('簇电流','电池簇',scope.row.clusterId)">{{scope.row.clusterCurrent}} A</span>
             </template>
           </el-table-column>
           <el-table-column
             label="簇SOC">
             <template slot-scope="scope">
-              <span>{{scope.row.currentSoc}} %</span>
+              <span class="pointer" @click="showChart('当前SOC','电池簇',scope.row.clusterId)">{{scope.row.currentSoc}} %</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="maxVoltage"
             label="单体最高电压">
             <template slot-scope="scope">
-              <span>{{scope.row.maxCellVoltage}} V</span>
+              <span class="pointer" @click="showChart('最高单体电压','电池簇',scope.row.clusterId)">{{scope.row.maxCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -69,7 +73,7 @@
             prop="minVoltage"
             label="单体最低电压">
             <template slot-scope="scope">
-              <span>{{scope.row.minCellVoltage}} V</span>
+              <span class="pointer" @click="showChart('最低单体电压','电池簇',scope.row.clusterId)">{{scope.row.minCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -79,7 +83,7 @@
           <el-table-column
             label="单体最高温度">
             <template slot-scope="scope">
-              <span>{{scope.row.maxCellTemp}} &#8451;</span>
+              <span class="pointer" @click="showChart('最高单体温度','电池簇',scope.row.clusterId)">{{scope.row.maxCellTemp}} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -90,7 +94,7 @@
             prop="minTemperature"
             label="单体最低温度">
             <template slot-scope="scope">
-              <span>{{scope.row.minCellTemp}} &#8451;</span>
+              <span class="pointer" @click="showChart('最低单体温度','电池簇',scope.row.clusterId)">{{scope.row.minCellTemp}} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -102,6 +106,7 @@
       </el-card>
     </div>
     <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
+    <point-chart ref="pointChart" :site-id="siteId"/>
   </div>
 </template>
 
@@ -109,27 +114,34 @@
 import {getBMSOverView} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import pointChart from "./../PointChart.vue";
 export default {
   name:'DzjkSbjkBmszl',
+  components: {pointChart,},
   mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       loading:false,
       baseInfoList:[],
       infoData:[
-        {label:'电池堆总电压',attr:'stackVoltage',unit:'V'},
-        {label:'可充电量',attr:'availableChargeCapacity',unit:'kWh'},
-        {label:'累计充电量',attr:'totalChargeCapacity',unit:'kWh'},
-        {label:'电池堆总电流',attr:'stackCurrent',unit:'A'},
-        {label:'可放电量',attr:'availableDischargeCapacity',unit:'kWh'},
-        {label:'累计放电量',attr:'totalDischargeCapacity',unit:'kWh'},
-        {label:'SOH',attr:'stackSoh',unit:'%'},
-        {label:'平均温度',attr:'operatingTemp',unit:'&#8451;'},
-        {label:'绝缘电阻',attr:'stackInsulationResistance',unit:'&Omega;'},
+        {label:'电池堆总电压',attr:'stackVoltage',unit:'V',pointName:'电池堆电压'},
+        {label:'可充电量',attr:'availableChargeCapacity',unit:'kWh',pointName:'可充电量'},
+        {label:'累计充电量',attr:'totalChargeCapacity',unit:'kWh',pointName:'累计充电量'},
+        {label:'电池堆总电流',attr:'stackCurrent',unit:'A',pointName:'电池堆总电流'},
+        {label:'可放电量',attr:'availableDischargeCapacity',unit:'kWh',pointName:'可放电量'},
+        {label:'累计放电量',attr:'totalDischargeCapacity',unit:'kWh',pointName:'累计放电量'},
+        {label:'SOH',attr:'stackSoh',unit:'%',pointName:'SOH'},
+        {label:'平均温度',attr:'operatingTemp',unit:'&#8451;',pointName:'平均温度'},
+        {label:'绝缘电阻',attr:'stackInsulationResistance',unit:'&Omega;',pointName:'绝缘电阻'},
       ]
     }
   },
   methods:{
+    //todo 后续需要新增设备id
+    showChart(pointName,categoryName,deviceId){
+      console.log('点击查询图表',pointName,categoryName,deviceId)
+      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    },
     updateData(){
       this.loading = true
       getBMSOverView(this.siteId).then(response => {
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index 75c6c50..487663f 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -24,6 +24,7 @@
       <el-table
         class="common-table"
         :data="zbInfo.loadDataDetailInfo"
+        @cell-click="handlerCell"
         stripe
         style="width: 100%"
       >
@@ -60,6 +61,7 @@
       <el-table
         class="common-table"
         :data="cnbInfo.meteDataDetailInfo"
+        @cell-click="handlerCellCN"
         stripe
         style="width: 100%"
       >
@@ -69,16 +71,19 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <point-chart ref="pointChart" :site-id="siteId"/>
   </div>
 </template>
 
 <script>
+import pointChart from "./../PointChart.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { getAmmeterDataList } from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name: "DzjkSbjkDb",
   mixins: [getQuerySiteId,intervalUpdate],
+  components:{pointChart},
   data() {
     return {
       loading: false,
@@ -87,6 +92,24 @@ export default {
     };
   },
   methods: {
+    handlerCell(row,column){
+      if(column.label !== '类别'){
+        const arr = row.category.split('')
+        arr.splice(6,0,column.label[0])
+        this.showChart(arr.join(''),'电表')
+      }
+    },
+    handlerCellCN(row,column){
+      if(column.label !== '类别'){
+        const arr = row.category.split('')
+        arr.splice(2,arr.length-2,column.label)
+        this.showChart(arr.join(''),'电表')
+      }
+    },
+    showChart(pointName,categoryName,deviceId){
+      console.log('点击查询图表',pointName,categoryName,deviceId)
+      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    },
     updateData(){
       this.loading = true;
       getAmmeterDataList(this.siteId)
@@ -120,6 +143,13 @@ export default {
       color: #ffffff;
       position: relative;
     }
+    .el-table__row td{
+      &:not(:first-child){
+        .cell{
+          cursor: pointer;
+        }
+      }
+    }
   }
 }
 .zb-common-card-container{
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index ba2db6d..2ca9ce7 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -29,32 +29,44 @@
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
           <el-descriptions labelClassName="descriptions-label" contentClassName="descriptions-direction" direction="vertical" :column="4" :colon="false">
-            <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">{{pcsItem[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span></el-descriptions-item>
+            <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
+              <span  class="pointer" @click="showChart(item.pointName || '','PCS设备',pcsItem.deviceId)">
+                {{pcsItem[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span>
+              </span>
+            </el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="descriptions-main" v-for="(item,index) in pcsItem.pcsBranchInfoList" :key="index+'pcsBranchInfoList'">
           <el-descriptions labelClassName="descriptions-label" contentClassName="descriptions-direction keep" direction="vertical" :column="4" :colon="false">
             <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction keep"  :span="4" :label="'支路'+(index+1)">{{item.dischargeStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流功率">{{item.dcPower}}kW</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电压">{{item.dcVoltage}}V</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电流">{{item.dcCurrent}}A</el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流功率">
+              <span class="pointer" @click="showChart('直流功率','PCS分支设备',item.deviceId)">{{item.dcPower}}kW</span>
+            </el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电压">
+              <span class="pointer" @click="showChart('直流电压','PCS分支设备',item.deviceId)">{{item.dcVoltage}}V</span>
+            </el-descriptions-item>
+            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电流">
+              <span class="pointer" @click="showChart('直流电流','PCS分支设备',item.deviceId)">{{item.dcCurrent}}A</span>
+            </el-descriptions-item>
           </el-descriptions>
         </div>
       </el-main>
     </el-container>
     <el-empty v-show="pcsList.length<=0" :image-size="200"></el-empty>
-
+<!--    电位图表 showChart({pointName:点位名称,categoryName:设备名称})-->
+    <point-chart ref="pointChart" :site-id="siteId"/>
   </div>
 </template>
 
 <script>
+import pointChart from "./../PointChart.vue";
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getRunningHeadInfo,getPcsDetailInfo} from '@/api/ems/dzjk'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 export default {
   name:'DzjkSbjkPcs',
-  components:{RealTimeBaseInfo},
+  components:{RealTimeBaseInfo,pointChart},
   mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
@@ -62,81 +74,30 @@ export default {
       runningHeadData:{},//运行信息
       pcsList:[],
       infoData:[
-        {label:'总交流有功电率',attr:'totalActivePower',unit:'kW'},
-        {label:'当天交流充电量',attr:'dailyAcChargeEnergy',unit:'kWh'},
-        {label:'A相电压',attr:'aPhaseVoltage',unit:'V'},
-        {label:'A相电流',attr:'aPhaseCurrent',unit:'A'},
-        {label:'总交流无功电率',attr:'totalReactivePower',unit:'kVar'},
-        {label:'当天交流放电量',attr:'dailyAcDischargeEnergy',unit:'kWh'},
-        {label:'B相电压',attr:'bPhaseVoltage',unit:'V'},
-        {label:'B相电流',attr:'bPhaseCurrent',unit:'A'},
-        {label:'总交流视在功率',attr:'totalApparentPower',unit:'kVA'},
-        {label:'PCS模块温度',attr:'pcsModuleTemperature',unit:'&#8451;'},
-        {label:'C相电压',attr:'cPhaseVoltage',unit:'V'},
-        {label:'C相电流',attr:'cPhaseCurrent',unit:'A'},
-        {label:'总交流功率因数',attr:'totalPowerFactor',unit:''},
-        {label:'PCS环境温度',attr:'pcsEnvironmentTemperature',unit:'&#8451;'},
-        {label:'交流频率',attr:'acFrequency',unit:'Hz'}
+        {label:'总交流有功电率',attr:'totalActivePower',unit:'kW',pointName:'总交流有功电率'},
+        {label:'当天交流充电量',attr:'dailyAcChargeEnergy',unit:'kWh',pointName:'当天交流充电量 (kWh)'},
+        {label:'A相电压',attr:'aPhaseVoltage',unit:'V',pointName:''},
+        {label:'A相电流',attr:'aPhaseCurrent',unit:'A',pointName:'A相电流'},
+        {label:'总交流无功电率',attr:'totalReactivePower',unit:'kVar',pointName:'总交流无功电率'},
+        {label:'当天交流放电量',attr:'dailyAcDischargeEnergy',unit:'kWh',pointName:'当天交流放电量 (kWh)'},
+        {label:'B相电压',attr:'bPhaseVoltage',unit:'V',pointName:''},
+        {label:'B相电流',attr:'bPhaseCurrent',unit:'A',pointName:'B相电流'},
+        {label:'总交流视在功率',attr:'totalApparentPower',unit:'kVA',pointName:'总交流视在功率'},
+        {label:'PCS模块温度',attr:'pcsModuleTemperature',unit:'&#8451;',pointName:''},
+        {label:'C相电压',attr:'cPhaseVoltage',unit:'V',pointName:''},
+        {label:'C相电流',attr:'cPhaseCurrent',unit:'A',pointName:'C相电流'},
+        {label:'总交流功率因数',attr:'totalPowerFactor',unit:'',pointName:'总交流功率因数'},
+        {label:'PCS环境温度',attr:'pcsEnvironmentTemperature',unit:'&#8451;',pointName:''},
+        {label:'交流频率',attr:'acFrequency',unit:'Hz',pointName:'交流频率'}
       ],
       pcsBranchList:[],//pcs的支路列表
     }
   },
   methods:{
-    problemSaved(){
-      this.$confirm('确认故障已复位?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        showClose:false,
-        closeOnClickModal:false,
-        type: 'warning',
-        beforeClose: (action, instance, done) => {
-          if (action === 'confirm') {
-            instance.confirmButtonLoading = true;
-            setTimeout(() => {
-              done();
-              instance.confirmButtonLoading = false;
-            }, 3000);
-          } else {
-            done();
-          }
-        }
-      }).then(() => {
-        //只有在故障复位成功的情况下会走到这里
-        this.$message({
-          type: 'success',
-          message: '故障复位成功!'
-        });
-      }).catch(() => {
-        //取消复位
-      });
-    },
-    machineClosed(){
-      this.$confirm('确认要关机吗?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        showClose:false,
-        closeOnClickModal:false,
-        type: 'warning',
-        beforeClose: (action, instance, done) => {
-          if (action === 'confirm') {
-            instance.confirmButtonLoading = true;
-            setTimeout(() => {
-              done();
-              instance.confirmButtonLoading = false;
-            }, 3000);
-          } else {
-            done();
-          }
-        }
-      }).then(() => {
-        //只有在关机成功的情况下会走到这里
-        this.$message({
-          type: 'success',
-          message: '关机成功!'
-        });
-      }).catch(() => {
-        //取消关机
-      });
+    //todo 后续需要新增设备id
+    showChart(pointName,categoryName,deviceId){
+      console.log('点击查询图表',pointName,categoryName,deviceId)
+      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
     },
     //6个方块数据
     getRunningHeadData(){
diff --git a/src/views/ems/search/DateTimeSelect.vue b/src/views/ems/search/DateTimeSelect.vue
index 0827588..ffbcb68 100644
--- a/src/views/ems/search/DateTimeSelect.vue
+++ b/src/views/ems/search/DateTimeSelect.vue
@@ -43,22 +43,6 @@ export default {
 
     }
   },
-  watch:{
-    dataUnit:{
-      handler(newVal,oldVal){
-        console.log('wacth到了dataUnit的变化',newVal,oldVal)
-        this.init()
-        // if(!oldVal && newVal){
-        //   this.init()
-        // }else{
-        //   this.init()
-        //   //为了触发调用图表接口
-        //   this.$emit('updateDate',this.dateRange || [])
-        // }
-      },
-      immediate: true,
-    }
-  },
   data() {
     return {
       loading:false,
@@ -73,7 +57,7 @@ export default {
   },
   methods: {
     init(){
-      const {dataUnit} = this
+        const {dataUnit} = this
         const timeDis= dataUnit === 3? 30 * 24 * 60 * 60 * 1000 :dataUnit === 2 ? 24 * 60 * 60 * 1000 : 60 * 60 * 1000
         const now = new Date(),formatNow = formatDate(now.getTime(),dataUnit !== 3 );
         const timeAgo = formatDate(new Date(now.getTime() - timeDis),dataUnit !== 3)
diff --git a/src/views/ems/search/index.vue b/src/views/ems/search/index.vue
index 13de9df..d3d8eaa 100644
--- a/src/views/ems/search/index.vue
+++ b/src/views/ems/search/index.vue
@@ -6,11 +6,6 @@
           prop="siteIds"
           :rules="[{ required: true, message: '请选择站点' }]"
       >
-<!--        <el-checkbox-group v-model="form.siteIds">-->
-<!--          <el-checkbox v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId" >-->
-<!--            {{ item.siteName }}-->
-<!--          </el-checkbox>-->
-<!--        </el-checkbox-group>-->
         <el-radio-group v-model="form.siteIds" >
           <el-radio  v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
             {{ item.siteName }}
@@ -43,13 +38,13 @@
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
-        <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">
-          <el-radio-group v-model="form.dataUnit">
-            <el-radio :label="1">分钟</el-radio>
-            <el-radio :label="2">小时</el-radio>
-            <el-radio :label="3">天</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">-->
+<!--          <el-radio-group v-model="form.dataUnit">-->
+<!--            <el-radio :label="1">分钟</el-radio>-->
+<!--            <el-radio :label="2">小时</el-radio>-->
+<!--            <el-radio :label="3">天</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
       </div>
       <el-form-item>
         <el-button type="primary" @click="submitForm">生成图表</el-button>
@@ -57,8 +52,14 @@
     </el-form>
     <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
       <div slot="header" class="time-range-header">
-        <span class="card-title"></span>
-        <date-time-select :data-unit="this.form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
+        <span class="card-title">
+          <el-radio-group v-model="form.dataUnit">
+            <el-radio :label="1">分钟</el-radio>
+            <el-radio :label="2">小时</el-radio>
+            <el-radio :label="3">天</el-radio>
+          </el-radio-group>
+        </span>
+        <date-time-select ref="dateTimeSelect" :data-unit="form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
       </div>
       <div style="height: 350px" id="searchChart"></div>
     </el-card>
@@ -92,7 +93,16 @@ export default {
         !newVal && (this.form.child = [])
       }
     },
-
+    'form.dataUnit':{
+      handler(newVal,oldVal){
+        console.log('wacth到了dataUnit的变化',newVal,oldVal)
+        this.$nextTick(()=>{
+          this.$refs.dateTimeSelect.init()
+          this.getDate()
+        })
+        // this.submitForm()
+      },
+    }
   },
   data() {
     return {
@@ -318,6 +328,7 @@ export default {
     this.loading= true
     this.$nextTick(()=>{
       this.initChart()
+      this.$refs.dateTimeSelect.init()
       Promise.all([this.getDeviceCategory(), this.getZdList()]).finally(()=>this.loading=false)
     })
   }

From 98e2c4c3be6341d5c078e4bcd78dee0525a2ed90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sat, 13 Sep 2025 22:41:41 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=94=B5=E4=BD=8D=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/site.js                    |   8 ++
 src/views/ems/site/sblb/PointTable.vue | 114 +++++++++++++++++++++++++
 src/views/ems/site/sblb/index.vue      |  16 +++-
 3 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 src/views/ems/site/sblb/PointTable.vue

diff --git a/src/api/ems/site.js b/src/api/ems/site.js
index e80d29a..73a7f74 100644
--- a/src/api/ems/site.js
+++ b/src/api/ems/site.js
@@ -62,3 +62,11 @@ export function getDeviceList(siteId) {
     method: 'get',
   })
 }
+
+//获取设备点位table
+export function getDevicePointList({siteId,deviceCategory,pageNum,pageSize}) {
+  return request({
+    url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}`,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/src/views/ems/site/sblb/PointTable.vue b/src/views/ems/site/sblb/PointTable.vue
new file mode 100644
index 0000000..56a46c8
--- /dev/null
+++ b/src/views/ems/site/sblb/PointTable.vue
@@ -0,0 +1,114 @@
+<!--电位展示图表-->
+<template>
+  <el-dialog
+      v-loading="loading"
+      :visible.sync="show"
+      title="点位列表"
+      :close-on-click-modal="false"
+      show-close
+      destroy-on-close
+      lock-scroll
+      append-to-body
+      width="600px"
+      class="ems-dialog"
+  >
+    <el-table
+        class="common-table"
+        :data="tableData"
+        stripe
+        max-height="600px"
+        style="width: 100%;">
+      <el-table-column
+          prop="dataPoint"
+          label="数据点位">
+      </el-table-column>
+      <el-table-column
+          prop="dataPointName"
+          label="数据点位名称">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+        v-show="tableData.length>0"
+        small
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :pager-count="5"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :page-sizes="[10, 20, 30, 40]"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalSize"
+        style="margin-top:15px;text-align: center"
+    >
+    </el-pagination>
+  </el-dialog>
+</template>
+<script>
+import {getDevicePointList} from "@/api/ems/site";
+
+export default {
+  watch:{
+    show(val) {
+      if(!val){
+        this.tableData=[]
+        this.deviceId=''
+        this.siteId=''
+        this.pageSize=10
+        this.pageNum=1
+        this.totalSize=0
+        this.loading =false
+      }
+    },
+  },
+  data(){
+    return{
+      show:false,
+      loading:false,
+      deviceCategory:'',
+      siteId:'',
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
+    }
+  },
+  methods:{
+    showTable({deviceCategory,siteId}){
+      this.deviceCategory =deviceCategory
+      this.siteId=siteId
+      this.show=true
+      this.getData()
+    },
+    getData(){
+      this.loading=true
+      const {siteId,deviceCategory,pageNum,pageSize} =this
+      getDevicePointList({siteId,deviceCategory,pageNum,pageSize}).then(response => {
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(() => {this.loading=false})
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep {
+  .card-title .el-radio{
+    line-height: 40px;
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue
index 1823343..cca460d 100644
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@@ -50,7 +50,7 @@
       <el-table-column
         fixed="right"
         label="操作"
-        width="150">
+        width="260">
         <template slot-scope="scope">
 <!--          <el-button-->
 <!--            @click="toDetail(scope.row.id)"-->
@@ -58,6 +58,12 @@
 <!--            size="mini">-->
 <!--            查看详情-->
 <!--          </el-button>-->
+          <el-button
+              @click="pointDetail(scope.row)"
+              type="primary"
+              size="mini">
+            电位列表
+          </el-button>
           <el-button
             @click="editDevice(scope.row)"
             type="warning"
@@ -94,6 +100,7 @@
       </div>
     </el-dialog>
     <add-device ref="addDevice" :mode="mode" :id="editDeviceId" @update="getData" @clear="clearEditDeviceData"/>
+    <point-table ref="pointTable"/>
   </div>
 </template>
 
@@ -101,10 +108,11 @@
 import {getDeviceInfoList,getDeviceDetailInfo,deleteService} from'@/api/ems/site'
 import {getAllSites} from '@/api/ems/zddt'
 import {formatNumber} from "@/filters/ems";
+import PointTable from './PointTable.vue'
 import AddDevice from "./AddDevice.vue";
 export default {
   name: "Sblb",
-  components:{AddDevice},
+  components:{AddDevice,PointTable},
   data() {
     return {
       loading:false,
@@ -142,6 +150,10 @@ export default {
     }
   },
   methods:{
+    // 查看设备电位表格
+    pointDetail(row){
+      this.$refs.pointTable.showTable({deviceCategory:row.deviceCategory,siteId:row.siteId})
+    },
     clearEditDeviceData(){
       this.mode = '';
       this.editDeviceId=''

From 52b6083baad2c3a6ea844cff3716eddb973c8c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sat, 13 Sep 2025 22:56:07 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E6=8E=A7?=
 =?UTF-8?q?=E5=AE=98=E6=9F=A5=E7=9C=8B=E7=82=B9=E4=BD=8D=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/sbjk/PointChart.vue   |  2 +-
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue |  2 +-
 src/views/ems/dzjk/sbjk/db/index.vue     | 12 ++++++------
 src/views/ems/dzjk/sbjk/pcs/index.vue    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/ems/dzjk/sbjk/PointChart.vue b/src/views/ems/dzjk/sbjk/PointChart.vue
index dcef16a..a0f4ff5 100644
--- a/src/views/ems/dzjk/sbjk/PointChart.vue
+++ b/src/views/ems/dzjk/sbjk/PointChart.vue
@@ -130,7 +130,7 @@ export default {
           endDate=end
         }
 
-        getPointValueList({siteIds:[this.siteId],dataUnit,categoryName:this.categoryName,pointName:this.pointName,startDate,endDate,siteDeviceMap:{}}).then(response => {
+        getPointValueList({siteIds:[this.siteId],deviceId:this.deviceId,dataUnit,categoryName:this.categoryName,pointName:this.pointName,startDate,endDate,siteDeviceMap:{}}).then(response => {
           this.setOption(response?.data || [])
         }).finally(()=>{
           this.hideLoading()
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index 3134f57..c0e1ebf 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -105,7 +105,7 @@ export default {
         '温度单体平均值':'温度平均值',
         '温度单体最大值':'最高单体温度',
         'SOC单体最小值':'最低单体SOC',
-        'SOC单体平均值':'',
+        'SOC单体平均值':'当前SOC',
         'SOC单体最大值':'最高单体SOC',
       },
       baseInfoList:[],
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index 487663f..95f4271 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -24,7 +24,7 @@
       <el-table
         class="common-table"
         :data="zbInfo.loadDataDetailInfo"
-        @cell-click="handlerCell"
+        @cell-click="(row,col)=>{handlerCell(zbInfo.deviceId,row,col)}"
         stripe
         style="width: 100%"
       >
@@ -61,7 +61,7 @@
       <el-table
         class="common-table"
         :data="cnbInfo.meteDataDetailInfo"
-        @cell-click="handlerCellCN"
+        @cell-click="(row,col)=>{handlerCellCN(cnbInfo.deviceId,row,col)}"
         stripe
         style="width: 100%"
       >
@@ -92,18 +92,18 @@ export default {
     };
   },
   methods: {
-    handlerCell(row,column){
+    handlerCell(id,row,column){
       if(column.label !== '类别'){
         const arr = row.category.split('')
         arr.splice(6,0,column.label[0])
-        this.showChart(arr.join(''),'电表')
+        this.showChart(arr.join(''),'电表',id)
       }
     },
-    handlerCellCN(row,column){
+    handlerCellCN(id,row,column){
       if(column.label !== '类别'){
         const arr = row.category.split('')
         arr.splice(2,arr.length-2,column.label)
-        this.showChart(arr.join(''),'电表')
+        this.showChart(arr.join(''),'电表',id)
       }
     },
     showChart(pointName,categoryName,deviceId){
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index 2ca9ce7..11b2a7d 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -30,7 +30,7 @@
         <div class="descriptions-main descriptions-main-bg-color">
           <el-descriptions labelClassName="descriptions-label" contentClassName="descriptions-direction" direction="vertical" :column="4" :colon="false">
             <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
-              <span  class="pointer" @click="showChart(item.pointName || '','PCS设备',pcsItem.deviceId)">
+              <span  class="pointer" @click="showChart(item.pointName || '','PCS',pcsItem.deviceId)">
                 {{pcsItem[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>

From e3224d37a19f2b241286665b56b6c06bd9e859fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Sun, 14 Sep 2025 23:33:53 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/dzjk.js                     |  12 +--
 src/views/ems/dzjk/tjbb/dcdqx/index.vue | 110 ++++++++++++++----------
 src/views/ems/dzjk/tjbb/glqx/index.vue  |  76 ++++------------
 src/views/ems/dzjk/tjbb/pcsqx/index.vue |  93 ++++++++++----------
 4 files changed, 136 insertions(+), 155 deletions(-)

diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index 5faf472..f14ab7a 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -116,16 +116,16 @@ export function getPcsNameList(siteId) {
   })
 }
 //pcs曲线
-export function getPCSData({siteId,deviceId,startTime,endTime,dataType}) {
+export function getPCSData({siteId,startTime,endTime,dataType}) {
   return request({
-    url: `/ems/statsReport/getPCSData?siteId=${siteId}&deviceId=${deviceId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
+    url: `/ems/statsReport/getPCSData?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
     method: 'get'
   })
 }
 //电池堆曲线
-export function getStackData({siteId,deviceId,startTime,endTime,dataType}) {
+export function getStackData({siteId,startTime,endTime,dataType}) {
   return request({
-    url: `/ems/statsReport/getStackData?siteId=${siteId}&deviceId=${deviceId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
+    url: `/ems/statsReport/getStackData?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
     method: 'get'
   })
 }
@@ -168,9 +168,9 @@ export function batteryAveTemp(siteId) {
   })
 }
 // 功率曲线
-export function getPowerData({siteId,deviceId,startDate,endDate,dataType}) {
+export function getPowerData({siteId,startDate,endDate}) {
   return request({
-    url: `/ems/statsReport/getPowerData?siteId=${siteId}&deviceId=${deviceId}&startDate=${startDate}&endDate=${endDate}&dataType=${dataType}`,
+    url: `/ems/statsReport/getPowerData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
     method: 'get'
   })
 }
diff --git a/src/views/ems/dzjk/tjbb/dcdqx/index.vue b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
index 8897cee..1e9f208 100644
--- a/src/views/ems/dzjk/tjbb/dcdqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
@@ -3,11 +3,11 @@
   <div v-loading="loading">
     <div class="select-container">
       <el-form :inline="true">
-        <el-form-item label="电池堆">
-          <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="电池堆">-->
+<!--          <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">-->
+<!--            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
@@ -62,14 +62,14 @@ export default {
       defaultDateRange:[],//默认展示的时间
       dateRange:[],
       loading:false,
-      pcs:'',
-      pcsOptions: [],
+      // pcs:'',
+      // pcsOptions: [],
       activeBtn:'1',
       btnList:[
-        {name:'堆平均维度',id:'1',attr:['temp'],source:[['日期','有功功率']]},
-        {name:'堆电压',id:'2',attr:['voltage'],source:[['日期','堆电压']]},
-        {name:'堆电流',id:'3',attr:['current'],source:[['日期','堆电流']]},
-        {name:'堆soc',id:'4',attr:['soc'],source:[['日期','堆soc']]},
+        {name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
+        {name:'堆电压',id:'2',attr:['voltage'],source:['堆电压']},
+        {name:'堆电流',id:'3',attr:['current'],source:['堆电流']},
+        {name:'堆soc',id:'4',attr:['soc'],source:['堆soc']},
       ],
     }
   },
@@ -90,41 +90,65 @@ export default {
       this.dateRange=''
       this.getData()
     },
-    getPcsList(){
-      return getStackNameList(this.siteId).then(response => {
-        const data = JSON.parse(JSON.stringify(response?.data || []))
-        this.pcsOptions = data
-        this.pcs = data.length>0?data[0].id:'';
-      })
-    },
+    // getPcsList(){
+    //   return getStackNameList(this.siteId).then(response => {
+    //     const data = JSON.parse(JSON.stringify(response?.data || []))
+    //     this.pcsOptions = data
+    //     this.pcs = data.length>0?data[0].id:'';
+    //   })
+    // },
     getData(){
-      const {siteId,pcs,activeBtn}=this;
+      const {siteId,activeBtn}=this;
       const [start='',end='']=(this.dateRange || [])
-      if(!pcs) return
       //接口调用完成之后 设置图表、结束loading
       this.loading=true;
-       getStackData({siteId,deviceId:pcs,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
+       getStackData({siteId,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
         this.setOption(response?.data || [])
       }).finally(()=>{this.loading=false;})
-
     },
     setOption(data) {
+
+      // [{
+      //   "deviceId": "PCS04",
+      //   "dataList": [
+      //     {
+      //       "statisDate": "2025-09-05",
+      //       "activePower": null,
+      //       "reactivePower": null,
+      //       "uCurrent": 1.30,
+      //       "vCurrent": 0.90,
+      //       "wCurrent": 1.00,
+      //       "deviceId": "PCS04"
+      //     },
+      //     {
+      //       "statisDate": "2025-09-04",
+      //       "activePower": null,
+      //       "reactivePower": null,
+      //       "uCurrent": 71.40,
+      //       "vCurrent": 71.30,
+      //       "wCurrent": 71.80,
+      //       "deviceId": "PCS04"
+      //     }
+      //   ]
+      // }]
       const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
-      const source = JSON.parse(JSON.stringify(ele.source))
-      const length = ele.attr.length
-      const series = []
-      data.forEach((item)=>{
-        const arr = ele.attr.map(key=>item[key])
-        source.push([item.statisDate,...arr])
-      })
-      ele.attr.forEach((item)=>{
-        series.push({
-          name:length>1?item:ele.name,
-          type:ele.type || 'scatter'
+      const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      const source=[]
+      const sourceTop = ['日期']
+      sourceBase.forEach((outer,outerIndex)=>{
+        data.forEach((item,itemIndex)=>{
+          sourceTop.push(`${item.deviceId}-${outer}`)
+          item.dataList.forEach((inner,innerIndex)=>{
+            if(itemIndex === 0 || innerIndex+1>source.length) {
+              source.push([inner.statisDate])
+            }
+            source[innerIndex].push(inner[ele.attr[outerIndex]])
+          })
         })
       })
+      source.unshift(sourceTop)
+      console.log('========',source)
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
         grid: {
           containLabel: true
         },
@@ -148,7 +172,11 @@ export default {
           type: 'value',
         },
         dataset: {source},
-        series
+        series:source[0].slice(1).map(item=>{
+          return {
+            type:ele.type || 'scatter'
+          }
+        })
       },true)
     },
     initChart() {
@@ -156,16 +184,10 @@ export default {
     },
     init(){
       this.loading = true
-      this.pcs=''
-      this.pcsOptions=[]
+      // this.pcs=''
+      // this.pcsOptions=[]
       this.initChart()
-      this.getPcsList().then(()=>{
-        if(this.pcs){
-          this.onReset()
-        }else{
-          this.loading = false
-        }
-      })
+      this.onReset()
     }
   },
   mounted(){
diff --git a/src/views/ems/dzjk/tjbb/glqx/index.vue b/src/views/ems/dzjk/tjbb/glqx/index.vue
index f4d8781..15270e6 100644
--- a/src/views/ems/dzjk/tjbb/glqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/glqx/index.vue
@@ -3,16 +3,6 @@
   <div v-loading="loading">
     <div class="select-container">
       <el-form :inline="true">
-<!--        <el-form-item label="网点">-->
-<!--          <el-select v-model="wd" placeholder="请选择" :loading="loading" loading-text="正在加载数据">-->
-<!--            <el-option :label="item.name" :value="item.id" v-for="(item,index) in wdOptions" :key="index+'sblxOptions'"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <el-form-item label="PCS">
-          <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
@@ -33,15 +23,6 @@
       </el-form>
     </div>
     <div style="margin:30px 0;">
-      <!--        二个选择按钮-->
-      <el-row style="">
-        <el-col :xs="24" :sm="24" :lg="24">
-          <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
-          </el-button-group>
-        </el-col>
-      </el-row>
-      <!--echart-->
       <div id="glqxEchart" style="height:360px;"></div>
     </div>
   </div>
@@ -67,26 +48,9 @@ export default {
       defaultDateRange:[],//默认展示的时间
       dateRange:[],
       loading:false,
-      pcs:'',
-      pcsOptions: [],
-      activeBtn:'1',
-      btnList:[
-        {name:'电网功率',id:'1',attr:'gridPower'},
-        {name:'负载功率',id:'2',attr:'loadPower'},
-        {name:'储能功率',id:'3',attr:'storagePower'},
-        {name:'光伏功率',id:'4',attr:'pvPower'},
-      ],
-
     }
   },
   methods: {
-    changeDataType(id){
-      if(id !== this.activeBtn){
-        console.log('点击了不同的菜单，更新数据')
-        this.activeBtn=id;
-        this.getData()
-      }
-    },
     // 搜索
     onSearch(){
       this.getData()
@@ -96,31 +60,21 @@ export default {
       this.dateRange=[]
       this.getData()
     },
-    getPcsList(){
-      return getPcsNameList(this.siteId).then(response => {
-        const data = response?.data || [];
-        this.pcsOptions = data
-        this.pcs = data.length>0?data[0].id:'';
-      })
-    },
     getData(){
-      const {siteId,pcs,activeBtn}=this;
+      const {siteId}=this;
       const [start='',end='']=(this.dateRange || [])
-      if(!pcs) return
       //接口调用完成之后 设置图表、结束loading
       this.loading=true;
-      getPowerData({siteId,deviceId:pcs,startDate:formatDate(start),endDate:formatDate(end),dataType:activeBtn}).then(response => {
+      getPowerData({siteId,startDate:formatDate(start),endDate:formatDate(end)}).then(response => {
         this.setOption(response?.data || [])
       }).finally(()=>{this.loading=false;})
     },
     setOption(data) {
-      const {name,attr} =this.btnList.find(item=>item.id===this.activeBtn)
-      const source = [['日期',name]]
-      data.forEach((item,index)=>{
-        source.push([item.statisDate,item[attr]])
+      const source = [['日期','电网功率','负载功率','储能功率','光伏功率']]
+      data.forEach(item=>{
+        source.push([item.statisDate,item.gridPower,item.loadPower,item.storagePower,item.pvPower])
       })
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
         grid: {
           containLabel: true
         },
@@ -146,7 +100,15 @@ export default {
         dataset:{source},
         series: [
           {
-            name,
+            type: 'scatter',
+          },
+          {
+            type: 'scatter',
+          },
+          {
+            type: 'scatter',
+          },
+          {
             type: 'scatter',
           }
         ]
@@ -157,16 +119,8 @@ export default {
     },
     init(){
       this.loading = true
-      this.pcs=''
-      this.pcsOptions=[]
       this.initChart()
-      this.getPcsList().then(()=>{
-        if(this.pcs){
-          this.onReset()
-        }else{
-          this.loading = false
-        }
-      })
+      this.getData()
     }
   },
   mounted(){
diff --git a/src/views/ems/dzjk/tjbb/pcsqx/index.vue b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
index c2ba632..62b5436 100644
--- a/src/views/ems/dzjk/tjbb/pcsqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
@@ -3,11 +3,11 @@
   <div v-loading="loading">
     <div class="select-container">
       <el-form :inline="true">
-        <el-form-item label="PCS">
-          <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="PCS">-->
+<!--          <el-select v-model="pcs" placeholder="请选择" :loading="loading" loading-text="正在加载数据">-->
+<!--            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in pcsOptions" :key="index+'pcsListOptions'"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="时间选择">
           <el-date-picker
             v-model="dateRange"
@@ -62,15 +62,15 @@ export default {
       defaultDateRange:[],//默认展示的时间
       dateRange:[],
       loading:false,
-      pcs:'',
-      pcsOptions: [],
+      // pcs:'',
+      // pcsOptions: [],
       activeBtn:'1',
       btnList:[
-        {name:'有功功率',id:'1',attr:['activePower'],source:[['日期','有功功率']]},
-        {name:'无功功率',id:'2',attr:['reactivePower'],source:[['日期','无功功率']]},
+        {name:'有功功率',id:'1',attr:['activePower'],source:['有功功率']},
+        {name:'无功功率',id:'2',attr:['reactivePower'],source:['无功功率']},
         // {name:'温度',id:'wd'},
         // {name:'三相电压',id:'sxdy'},
-        {name:'三相电流',id:'3',attr:['uCurrent','vCurrent','wCurrent'],source:[['日期','u电流','v电流','w电流']],type:'bar'},
+        {name:'三相电流',id:'3',attr:['uCurrent','vCurrent','wCurrent'],source:['u电流','v电流','w电流'],type:'bar'},
       ],
 
     }
@@ -93,41 +93,42 @@ export default {
       this.dateRange=[]
       this.getData()
     },
-    getPcsList(){
-      return getPcsNameList(this.siteId).then(response => {
-        const data = response?.data || [];
-        this.pcsOptions = data
-        this.pcs = data.length>0?data[0].id:'';
-      })
-    },
+    // getPcsList(){
+    //   return getPcsNameList(this.siteId).then(response => {
+    //     const data = response?.data || [];
+    //     this.pcsOptions = data
+    //     this.pcs = data.length>0?data[0].id:'';
+    //   })
+    // },
     getData(){
-      const {siteId,pcs,activeBtn}=this;
+      const {siteId,activeBtn}=this;
       const [start='',end='']=(this.dateRange || [])
-      if(!pcs) return
       this.loading=true;
       //接口调用完成之后 设置图表、结束loading
-      getPCSData({siteId,deviceId:pcs,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
+      getPCSData({siteId,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
         this.setOption(response?.data || [])
       }).finally(()=>{this.loading=false;})
 
     },
     setOption(data) {
       const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
-      const source = JSON.parse(JSON.stringify(ele.source))
-      const length = ele.attr.length
-      const series = []
-      data.forEach((item)=>{
-        const arr = ele.attr.map(key=>item[key])
-        source.push([item.statisDate,...arr])
-      })
-      ele.attr.forEach((item)=>{
-        series.push({
-          name:length>1?item:ele.name,
-          type:ele.type || 'scatter'
+      const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      const source=[]
+      const sourceTop = ['日期']
+      sourceBase.forEach((outer,outerIndex)=>{
+        data.forEach((item,itemIndex)=>{
+          sourceTop.push(`${item.deviceId}-${outer}`)
+          item.dataList.forEach((inner,innerIndex)=>{
+            if(itemIndex === 0 || innerIndex+1>source.length) {
+              source.push([inner.statisDate])
+            }
+            source[innerIndex].push(inner[ele.attr[outerIndex]])
+          })
         })
       })
+      source.unshift(sourceTop)
+      console.log('========',source)
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF','#91cc74'],
         grid: {
           containLabel: true
         },
@@ -151,7 +152,11 @@ export default {
           type: 'value',
         },
         dataset: {source},
-        series
+        series:source[0].slice(1).map(item=>{
+          return {
+            type:ele.type || 'scatter'
+          }
+        })
 
       },true)
     },
@@ -160,18 +165,18 @@ export default {
     },
     init(){
       this.loading = true
-      this.pcs=''
-      this.pcsOptions=[]
-      this.dateRange =[]
+      // this.pcs=''
+      // this.pcsOptions=[]
       this.initChart()
-      this.getPcsList().then(()=>{
-        if(this.pcs){
-          this.onReset()
-        }else{
-          this.loading=false;
-        }
-
-      })
+      this.onReset()
+      // this.getPcsList().then(()=>{
+      //   if(this.pcs){
+      //     this.onReset()
+      //   }else{
+      //     this.loading=false;
+      //   }
+      //
+      // })
     }
   },
   mounted(){

From 7f560cd1402fcde279f8f6d509b73a8f82b26ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 16 Sep 2025 18:20:48 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/tjbb/dcdqx/index.vue | 66 ++++++++++++++-----------
 src/views/ems/dzjk/tjbb/pcsqx/index.vue | 42 +++++++++++++---
 2 files changed, 72 insertions(+), 36 deletions(-)

diff --git a/src/views/ems/dzjk/tjbb/dcdqx/index.vue b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
index 1e9f208..dae643c 100644
--- a/src/views/ems/dzjk/tjbb/dcdqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/dcdqx/index.vue
@@ -106,47 +106,53 @@ export default {
         this.setOption(response?.data || [])
       }).finally(()=>{this.loading=false;})
     },
+    compareDate(date1,date2){
+      console.log('比较时间',date1,date2)
+      // 年2025-09/天2025-09-15/时2025-09-15/10:00
+      if(date1.indexOf(':') > -1 && date2.indexOf(':') > -1){
+        return parseInt(date1) - parseInt(date2)
+      }
+      const [date1_Y='',date1_M='',date1_D=''] = date1.split('-')//根据空格区分[年月日,小时]
+      const [date2_Y='',date2_M='',date2_D=''] = date2.split('-')//根据空格区分[年月日,小时]
+      return (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) || (date1_Y === date2_Y && date1_M - date2_M) || date1_Y - date2_Y
+    },
     setOption(data) {
-
-      // [{
-      //   "deviceId": "PCS04",
-      //   "dataList": [
-      //     {
-      //       "statisDate": "2025-09-05",
-      //       "activePower": null,
-      //       "reactivePower": null,
-      //       "uCurrent": 1.30,
-      //       "vCurrent": 0.90,
-      //       "wCurrent": 1.00,
-      //       "deviceId": "PCS04"
-      //     },
-      //     {
-      //       "statisDate": "2025-09-04",
-      //       "activePower": null,
-      //       "reactivePower": null,
-      //       "uCurrent": 71.40,
-      //       "vCurrent": 71.30,
-      //       "wCurrent": 71.80,
-      //       "deviceId": "PCS04"
-      //     }
-      //   ]
-      // }]
       const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
       const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      // sourceBase={name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
       const source=[]
       const sourceTop = ['日期']
-      sourceBase.forEach((outer,outerIndex)=>{
-        data.forEach((item,itemIndex)=>{
+      let map={},mapArr=[]
+      // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
+      data.forEach((item)=>{
+        item.dataList.forEach((inner)=>{
+          // 日期格式
+          // 年2025-09/天2025-09-15/时2025-09-15/10:00
+          // 所有数据的日期格式一致
+          if(!map[inner.statisDate]) {
+            map[inner.statisDate] = []
+            mapArr.push(inner.statisDate)
+          }
+        })
+      })
+      data.forEach((item,itemIndex)=>{
+        const dataTimeList = item.dataList.map(i =>i.statisDate)
+        const noDataTime = mapArr.filter(i=>!dataTimeList.includes(i))
+        sourceBase.forEach((outer,outerIndex)=>{
           sourceTop.push(`${item.deviceId}-${outer}`)
+          noDataTime.forEach(i=>map[i].push(''))
           item.dataList.forEach((inner,innerIndex)=>{
-            if(itemIndex === 0 || innerIndex+1>source.length) {
-              source.push([inner.statisDate])
-            }
-            source[innerIndex].push(inner[ele.attr[outerIndex]])
+            map[inner.statisDate].push(inner[ele.attr[outerIndex]])
           })
         })
       })
+      mapArr = mapArr.sort((a,b)=>this.compareDate(a,b))
+      mapArr.forEach(item=>{
+        source.push([item,...map[item]])
+      })
       source.unshift(sourceTop)
+      console.log('map=',map)
+      console.log('mapArr=',mapArr)
       console.log('========',source)
       this.chart.setOption({
         grid: {
diff --git a/src/views/ems/dzjk/tjbb/pcsqx/index.vue b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
index 62b5436..b6c7131 100644
--- a/src/views/ems/dzjk/tjbb/pcsqx/index.vue
+++ b/src/views/ems/dzjk/tjbb/pcsqx/index.vue
@@ -110,23 +110,53 @@ export default {
       }).finally(()=>{this.loading=false;})
 
     },
+    compareDate(date1,date2){
+      console.log('比较时间',date1,date2)
+      // 年2025-09/天2025-09-15/时2025-09-15/10:00
+      if(date1.indexOf(':') > -1 && date2.indexOf(':') > -1){
+        return parseInt(date1) - parseInt(date2)
+      }
+      const [date1_Y='',date1_M='',date1_D=''] = date1.split('-')//根据空格区分[年月日,小时]
+      const [date2_Y='',date2_M='',date2_D=''] = date2.split('-')//根据空格区分[年月日,小时]
+      return (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) || (date1_Y === date2_Y && date1_M - date2_M) || date1_Y - date2_Y
+    },
     setOption(data) {
       const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
       const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      // sourceBase={name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
       const source=[]
       const sourceTop = ['日期']
-      sourceBase.forEach((outer,outerIndex)=>{
-        data.forEach((item,itemIndex)=>{
+      let map={},mapArr=[]
+      // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
+      data.forEach((item)=>{
+        item.dataList.forEach((inner)=>{
+          // 日期格式
+          // 年2025-09/天2025-09-15/时2025-09-15/10:00
+          // 所有数据的日期格式一致
+          if(!map[inner.statisDate]) {
+            map[inner.statisDate] = []
+            mapArr.push(inner.statisDate)
+          }
+        })
+      })
+      data.forEach((item,itemIndex)=>{
+        const dataTimeList = item.dataList.map(i =>i.statisDate)
+        const noDataTime = mapArr.filter(i=>!dataTimeList.includes(i))
+        sourceBase.forEach((outer,outerIndex)=>{
           sourceTop.push(`${item.deviceId}-${outer}`)
+          noDataTime.forEach(i=>map[i].push(''))
           item.dataList.forEach((inner,innerIndex)=>{
-            if(itemIndex === 0 || innerIndex+1>source.length) {
-              source.push([inner.statisDate])
-            }
-            source[innerIndex].push(inner[ele.attr[outerIndex]])
+            map[inner.statisDate].push(inner[ele.attr[outerIndex]])
           })
         })
       })
+      mapArr = mapArr.sort((a,b)=>this.compareDate(a,b))
+      mapArr.forEach(item=>{
+        source.push([item,...map[item]])
+      })
       source.unshift(sourceTop)
+      console.log('map=',map)
+      console.log('mapArr=',mapArr)
       console.log('========',source)
       this.chart.setOption({
         grid: {

From 902e9a0a031c5810f04e73875d515a2921d61946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Wed, 17 Sep 2025 11:15:54 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=A6=96=E9=A1=B5-?=
 =?UTF-8?q?=E5=BD=93=E6=97=A5=E5=8A=9F=E7=8E=87=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/dzjk.js                     |  8 ++++
 src/views/ems/dzjk/home/ActiveChart.vue | 51 +++++++++++--------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index f14ab7a..47b89e2 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -291,3 +291,11 @@ export function curveList({siteId,strategyId}) {
     method: 'get',
   })
 }
+
+//单站监控 首页 当日功率曲线
+export function getPointData({siteId,startDate,endDate}) {
+  return request({
+    url: `/ems/siteMonitor/getPointData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/src/views/ems/dzjk/home/ActiveChart.vue b/src/views/ems/dzjk/home/ActiveChart.vue
index 1d768a0..a1a5aa1 100644
--- a/src/views/ems/dzjk/home/ActiveChart.vue
+++ b/src/views/ems/dzjk/home/ActiveChart.vue
@@ -13,7 +13,7 @@
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
-import {getPcsNameList, getPowerData} from '@/api/ems/dzjk'
+import { getPointData } from '@/api/ems/dzjk'
 
 export default {
   mixins: [resize],
@@ -23,7 +23,7 @@ export default {
       chart: null,
       timeRange:[],
       siteId:'',
-      deviceId:''
+      isInit:true
     }
   },
   mounted() {
@@ -42,33 +42,23 @@ export default {
     // 更新时间范围 重置图表
     updateDate(data){
       this.timeRange=data
-      this.getGVQXData()
+      !this.isInit && this.getGVQXData()
+      this.isInit = false
     },
     getGVQXData(){
       this.showLoading()
-      const {siteId,deviceId,timeRange}=this
-      if(!deviceId) return this.hideLoading()
-      getPowerData({siteId,deviceId,startDate:timeRange[0],endDate:timeRange[1],dataType:'1'}).then(response => {
+      const {siteId,timeRange}=this
+      getPointData({siteId,startDate:timeRange[0],endDate:timeRange[1]}).then(response => {
         this.setOption(response?.data || [])
       }).finally(()=>this.hideLoading())
     },
     init(siteId){
       //初始化 清空数据
       this.siteId = siteId
+      this.isInit = true
       this.timeRange=[]
-      this.deviceId=''
       this.$refs.dateRangeSelect.init(true)
-      this.showLoading()
-      getPcsNameList(siteId).then(response=>{
-        const data=response?.data || [];
-        if(data.length>0){
-          this.deviceId=data[0].id
-          //接口调用完成之后 设置图表、结束loading
-          this.getGVQXData()
-        }else{
-          this.hideLoading()
-        }
-      })
+      this.getGVQXData()
     },
     initChart() {
       this.chart = echarts.init(document.querySelector('#activeChart'))
@@ -80,12 +70,12 @@ export default {
       this.chart && this.chart.hideLoading()
     },
     setOption(data) {
-      const source = [['日期','电网功率']]
+      const source = [['日期','电网功率','负载功率','储能功率','光伏功率','soc平均值','soh平均值','电池平均温度平均值']]
+      console.log('source.slice(1)',source[0].slice(1))
       this.chart && data.forEach((item)=>{
-        source.push([item.statisDate,item.gridPower])
+        source.push([item.statisDate,item.gridPower,item.loadPower,item.storagePower,item.pvPower,item.avgSoc,item.avgSoh,item.avgTemp])
       })
       this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
         grid: {
           containLabel: true
         },
@@ -105,16 +95,21 @@ export default {
         xAxis: {
           type: 'category',
         },
-        yAxis: {
-          type: 'value',
-        },
-        dataset:{source},
-        series: [
+        yAxis: [
           {
-            name:'电网功率',
+            type: 'value',
+          },
+          {
+            type: 'value',
+          },
+        ],
+        dataset:{source},
+        series: source[0].slice(1).map((item,index)=>{
+          return {
             type: 'line',
+            yAxisIndex:index<=4 ? 0 : 1
           }
-        ]
+        })
       })
     },
 

From 36b1e19120dc317749b337bb57c7f7cf03a72599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Wed, 17 Sep 2025 14:52:08 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/common.scss            |  60 +++++++++-
 src/views/ems/dzjk/sbjk/bmsdcc/index.vue |   8 +-
 src/views/ems/dzjk/sbjk/bmszl/index.vue  |  59 +++++-----
 src/views/ems/dzjk/sbjk/db/index.vue     |  46 ++------
 src/views/ems/dzjk/sbjk/dtdc/index.vue   |   2 +-
 src/views/ems/dzjk/sbjk/pcs/index.vue    | 143 +++++++++--------------
 6 files changed, 158 insertions(+), 160 deletions(-)

diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss
index 7a7d78a..435ec15 100644
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@@ -26,18 +26,15 @@
       border-bottom: none;
       font-size: 12px;
       background: #F1F5FB ;
+      position: relative;
       .card-title{
         font-weight: 500;
         color:#333333;
       }
-      .large-title{
-        font-size: 20px;
-        font-weight: 500;
-        line-height: 40px;
-      }
       .el-button--text{
         color: #666666;
       }
+
     }
 }
 .common-card-container-body-no-padding{
@@ -50,6 +47,59 @@
       background-color: transparent;
     }
 }
+//单站监控 设备监控card公共样式
+.sbjk-card-container{
+  .el-card__header {
+    background-color: transparent;
+    padding: 10px 14px;
+    color: #ffffff;
+    position: relative;
+    border-radius: 5px 5px 0 0;
+    .large-title{
+      font-size: 20px;
+      font-weight: 500;
+      line-height: 40px;
+      padding: 0 50px 0 11px;
+      display: inline-block;
+      vertical-align: middle;
+    }
+    .info {
+      display: inline-block;
+      vertical-align: middle;
+      color: #ffffff;
+      font-size: 12px;
+      line-height: 20px;
+    }
+    .el-button--text{
+      color: #666666;
+    }
+    .alarm{
+      position: absolute;
+      right: 25px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+  //红色背景颜色标题
+  &.warning-card-container{
+    .el-card__header {
+      background-color: #fc6b69;
+    }
+  }
+  //绿色背景颜色标题
+  &.running-card-container {
+    .el-card__header {
+      background-color: #05aea3;
+    }
+  }
+  //灰色背景颜色标题
+  &.timing-card-container {
+    .el-card__header {
+      background-color: #666666;
+    }
+  }
+}
+
 /* card标题里的时间选择器 */
 .time-range-card {
   &.common-card-container .el-card__header {
diff --git a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
index c0e1ebf..cd19393 100644
--- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue
@@ -2,9 +2,13 @@
 <template>
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
-      <el-card shadow="always" class="common-card-container common-card-container-body-no-padding common-card-container-no-title-bg">
+      <el-card shadow="always" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+       :class="{
+        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+        'running-card-container':baseInfo.workStatus === '0'
+      }">
         <div slot="header">
-          <span class="large-title">{{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} -> ` : ''}}{{baseInfo.deviceName}}</span>
+          <span class="large-title">{{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} —> ` : ''}}{{baseInfo.deviceName}}</span>
         </div>
           <div class="descriptions-main">
             <el-descriptions direction="vertical" :column="3" :colon="false">
diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue
index c3466b2..391ea2e 100644
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@@ -2,20 +2,24 @@
 <template>
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
-      <el-card shadow="always" class="common-card-container common-card-container-body-no-padding common-card-container-no-title-bg">
+      <el-card :class="{
+        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+        'running-card-container':baseInfo.workStatus === '0'
+      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+               shadow="always">
         <div slot="header">
           <span class="large-title">{{index+1}}#{{baseInfo.deviceName}}</span>
         </div>
         <div class="descriptions-main">
-          <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与PCS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与EMS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
+          <el-descriptions :colon="false" :column="3" direction="vertical">
+            <el-descriptions-item :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态" labelClassName="descriptions-label" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
+            <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="与PCS通信" labelClassName="descriptions-label">{{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}}</el-descriptions-item>
+            <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="与EMS通信" labelClassName="descriptions-label">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
-          <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item  labelClassName="descriptions-label" contentClassName="descriptions-direction" v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
+          <el-descriptions :colon="false" :column="3" direction="vertical">
+            <el-descriptions-item  v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :label="item.label" :span="1" contentClassName="descriptions-direction" labelClassName="descriptions-label">
               <span  class="pointer" @click="showChart(item.pointName || '','电池堆',baseInfo.deviceId)">
                 {{baseInfo[item.attr] | formatNumber}}<span v-if="item.unit" v-html="item.unit"></span>
               </span>
@@ -24,20 +28,20 @@
           <!--        进度-->
           <div class="process-container">
             <div class="process-line-bg">
-              <div class="process-line" :style="{height:baseInfo.stackSoc+'%'}"></div>
+              <div :style="{height:baseInfo.stackSoc+'%'}" class="process-line"></div>
             </div>
             <div class="process pointer" @click="showChart('当前SOC','电池堆',baseInfo.deviceId)">当前SOC : {{baseInfo.stackSoc}}%</div>
           </div>
         </div>
         <el-table
-          class="common-table"
           :data="baseInfo.batteryDataList"
-          stripe
+          class="common-table"
           max-height="500"
+          stripe
           style="width: 100%;margin-top:25px;">
           <el-table-column
-            prop="clusterId"
-            label="簇号">
+            label="簇号"
+            prop="clusterId">
           </el-table-column>
           <el-table-column
             label="簇电压"
@@ -59,26 +63,26 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="maxVoltage"
-            label="单体最高电压">
+            label="单体最高电压"
+            prop="maxVoltage">
             <template slot-scope="scope">
               <span class="pointer" @click="showChart('最高单体电压','电池簇',scope.row.clusterId)">{{scope.row.maxCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="maxCellVoltageId"
-            label="电池号码">
+            label="电池号码"
+            prop="maxCellVoltageId">
           </el-table-column>
           <el-table-column
-            prop="minVoltage"
-            label="单体最低电压">
+            label="单体最低电压"
+            prop="minVoltage">
             <template slot-scope="scope">
               <span class="pointer" @click="showChart('最低单体电压','电池簇',scope.row.clusterId)">{{scope.row.minCellVoltage}} V</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="minCellVoltageId"
-            label="电池号码">
+            label="电池号码"
+            prop="minCellVoltageId">
           </el-table-column>
           <el-table-column
             label="单体最高温度">
@@ -87,19 +91,19 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="maxCellTempId"
-            label="电池号码">
+            label="电池号码"
+            prop="maxCellTempId">
           </el-table-column>
           <el-table-column
-            prop="minTemperature"
-            label="单体最低温度">
+            label="单体最低温度"
+            prop="minTemperature">
             <template slot-scope="scope">
               <span class="pointer" @click="showChart('最低单体温度','电池簇',scope.row.clusterId)">{{scope.row.minCellTemp}} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="minCellTempId"
-            label="电池号码">
+            label="电池号码"
+            prop="minCellTempId">
           </el-table-column>
 
         </el-table>
@@ -137,7 +141,6 @@ export default {
     }
   },
   methods:{
-    //todo 后续需要新增设备id
     showChart(pointName,categoryName,deviceId){
       console.log('点击查询图表',pointName,categoryName,deviceId)
       pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
@@ -157,7 +160,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 ::v-deep {
   //描述列表样式
   .descriptions-main {
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue
index 95f4271..6ce1f31 100644
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@@ -2,15 +2,15 @@
   <div v-loading="loading">
     <el-card
       shadow="always"
-      class="common-card-container"
+      class="sbjk-card-container"
       :class="{
-        'zb-common-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
-        'cnb-common-card-container':zbInfo.emsCommunicationStatus === '0'
+        'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
+        'running-card-container':zbInfo.emsCommunicationStatus === '0'
       }"
     >
       <div slot="header">
         <span class="large-title">1#{{ zbInfo.deviceName }}</span>
-        <div class="status">
+        <div class="info">
           <div>
             {{
               $store.state.ems.communicationStatusOptions[
@@ -38,16 +38,16 @@
     </el-card>
     <el-card
       shadow="always"
-      class="common-card-container"
+      class="sbjk-card-container"
       style="margin-top: 20px"
       :class="{
-        'zb-common-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
-        'cnb-common-card-container':zbInfo.emsCommunicationStatus === '0'
+        'warning-card-container':zbInfo.emsCommunicationStatus && zbInfo.emsCommunicationStatus !== '0',
+        'running-card-container':zbInfo.emsCommunicationStatus === '0'
       }"
     >
       <div slot="header">
         <span class="large-title">2#{{ cnbInfo.deviceName }}</span>
-        <div class="status">
+        <div class="info">
           <div>
             {{
               $store.state.ems.communicationStatusOptions[
@@ -137,12 +137,6 @@ export default {
 <style scoped lang="scss">
 .common-card-container {
   ::v-deep {
-    .el-card__header {
-      background-color: transparent;
-      padding: 10px 14px;
-      color: #ffffff;
-      position: relative;
-    }
     .el-table__row td{
       &:not(:first-child){
         .cell{
@@ -152,27 +146,5 @@ export default {
     }
   }
 }
-.zb-common-card-container{
-  ::v-deep {
-    .el-card__header {
-      background-color: #fc6b69;
-    }
-  }
-}
-.cnb-common-card-container {
-  ::v-deep {
-    .el-card__header {
-      background-color: #05aea3;
-    }
-  }
-}
-.status {
-  position: absolute;
-  right: 14px;
-  top: 50%;
-  transform: translateY(-50%);
-  color: #ffffff;
-  font-size: 12px;
-  line-height: 20px;
-}
+
 </style>
diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue
index d085e62..46c9ac2 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@@ -2,7 +2,7 @@
   <el-card
     v-loading="loading"
     shadow="always"
-    class="common-card-container common-card-container-no-title-bg"
+    class="sbjk-card-container common-card-container-no-title-bg running-card-container"
   >
     <div slot="header">
       <span class="large-title">单体电池实时数据</span>
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index 11b2a7d..5e85d36 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -1,57 +1,66 @@
 
 <template>
-  <div class="pcs-ems-dashboard-editor-container" v-loading="loading">
+  <div v-loading="loading" class="pcs-ems-dashboard-editor-container">
 <!--    顶部六个方块-->
     <real-time-base-info :data="runningHeadData"/>
-<!--    内容-->
-    <el-container class="pcs-container" v-for="(pcsItem,pcsIndex) in pcsList" :key="pcsIndex+'PcsHome'">
-<!--      背景颜色根据工作状态来展示-->
-      <el-header class="pcs-header" :class="pcsItem.workStatus === '1' ? 'warn' : pcsItem.workStatus === '2' ? 'close' : ''">
-        <div class="pcs-title">{{pcsItem.deviceName}}</div>
-        <div class="pcs-status">
-          <div>{{$store.state.ems.communicationStatusOptions[pcsItem.communicationStatus]}}</div>
-          <div>数据更新时间：{{pcsItem.dataUpdateTime}}</div>
+    <div v-for="(pcsItem,pcsIndex) in pcsList" :key="pcsIndex+'PcsHome'" style="margin-bottom:25px;">
+    <el-card :class="{
+        'warning-card-container':pcsItem.workStatus === '1',
+        'timing-card-container':pcsItem.workStatus === '2',
+        'running-card-container':!['1','2'].includes(pcsItem.workStatus)
+      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+             shadow="always">
+        <div slot="header">
+          <span class="large-title">{{pcsIndex+1}}#{{pcsItem.deviceName}}</span>
+          <div class="info">
+            <div>
+              {{
+                $store.state.ems.communicationStatusOptions[
+                    pcsItem.communicationStatus
+                    ]
+              }}
+            </div>
+            <div>数据更新时间：{{ pcsItem.dataUpdateTime }}</div>
+          </div>
+          <div class="alarm">
+            <el-badge :value="pcsItem.alarmNum || 0" class="item">
+              <i class="el-icon-message-solid" style="font-size: 26px;color: #fff;display: block;"></i>
+            </el-badge>
+          </div>
         </div>
-       <div class="pcs-btns">
-        <el-badge :value="pcsItem.alarmNum || 0" class="item">
-          <i class="el-icon-message-solid" style="font-size: 26px;color: #fff;display: block;"></i>
-        </el-badge>
-       </div>
-      </el-header>
-      <el-main style="padding: 0">
-        <div class="descriptions-main">
-          <el-descriptions direction="vertical" :column="4" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${pcsItem.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态">{{$store.state.ems.workStatusOptions[pcsItem.workStatus]}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="并网状态">{{$store.state.ems.gridStatusOptions[pcsItem.gridStatus]}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${pcsItem.deviceStatus === '0' ? 'save' : 'danger'}`" :span="1" label="设备状态">{{$store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="控制模式">{{$store.state.ems.controlModeOptions[pcsItem.controlMode]}}</el-descriptions-item>
-          </el-descriptions>
-        </div>
-        <div class="descriptions-main descriptions-main-bg-color">
-          <el-descriptions labelClassName="descriptions-label" contentClassName="descriptions-direction" direction="vertical" :column="4" :colon="false">
-            <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1" :label="item.label">
+      <div class="descriptions-main">
+        <el-descriptions :colon="false" :column="4" direction="vertical">
+          <el-descriptions-item :contentClassName="`descriptions-direction ${pcsItem.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态" labelClassName="descriptions-label">{{$store.state.ems.workStatusOptions[pcsItem.workStatus]}}</el-descriptions-item>
+          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="并网状态" labelClassName="descriptions-label">{{$store.state.ems.gridStatusOptions[pcsItem.gridStatus]}}</el-descriptions-item>
+          <el-descriptions-item :contentClassName="`descriptions-direction ${pcsItem.deviceStatus === '0' ? 'save' : 'danger'}`" :span="1" label="设备状态" labelClassName="descriptions-label">{{$store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]}}</el-descriptions-item>
+          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="控制模式" labelClassName="descriptions-label">{{$store.state.ems.controlModeOptions[pcsItem.controlMode]}}</el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div class="descriptions-main descriptions-main-bg-color">
+        <el-descriptions :colon="false" :column="4" contentClassName="descriptions-direction" direction="vertical" labelClassName="descriptions-label">
+          <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :label="item.label" :span="1">
               <span  class="pointer" @click="showChart(item.pointName || '','PCS',pcsItem.deviceId)">
                 {{pcsItem[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span>
               </span>
-            </el-descriptions-item>
-          </el-descriptions>
-        </div>
-        <div class="descriptions-main" v-for="(item,index) in pcsItem.pcsBranchInfoList" :key="index+'pcsBranchInfoList'">
-          <el-descriptions labelClassName="descriptions-label" contentClassName="descriptions-direction keep" direction="vertical" :column="4" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction keep"  :span="4" :label="'支路'+(index+1)">{{item.dischargeStatus}}</el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流功率">
-              <span class="pointer" @click="showChart('直流功率','PCS分支设备',item.deviceId)">{{item.dcPower}}kW</span>
-            </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电压">
-              <span class="pointer" @click="showChart('直流电压','PCS分支设备',item.deviceId)">{{item.dcVoltage}}V</span>
-            </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="直流电流">
-              <span class="pointer" @click="showChart('直流电流','PCS分支设备',item.deviceId)">{{item.dcCurrent}}A</span>
-            </el-descriptions-item>
-          </el-descriptions>
-        </div>
-      </el-main>
-    </el-container>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div v-for="(item,index) in pcsItem.pcsBranchInfoList" :key="index+'pcsBranchInfoList'" class="descriptions-main">
+        <el-descriptions :colon="false" :column="4" contentClassName="descriptions-direction keep" direction="vertical" labelClassName="descriptions-label">
+          <el-descriptions-item :label="'支路'+(index+1)" :span="4"  contentClassName="descriptions-direction keep" labelClassName="descriptions-label">{{item.dischargeStatus}}</el-descriptions-item>
+          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流功率" labelClassName="descriptions-label">
+            <span class="pointer" @click="showChart('直流功率','PCS分支设备',item.deviceId)">{{item.dcPower}}kW</span>
+          </el-descriptions-item>
+          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流电压" labelClassName="descriptions-label">
+            <span class="pointer" @click="showChart('直流电压','PCS分支设备',item.deviceId)">{{item.dcVoltage}}V</span>
+          </el-descriptions-item>
+          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流电流" labelClassName="descriptions-label">
+            <span class="pointer" @click="showChart('直流电流','PCS分支设备',item.deviceId)">{{item.dcCurrent}}A</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      </el-card>
+    </div>
     <el-empty v-show="pcsList.length<=0" :image-size="200"></el-empty>
 <!--    电位图表 showChart({pointName:点位名称,categoryName:设备名称})-->
     <point-chart ref="pointChart" :site-id="siteId"/>
@@ -125,45 +134,5 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.pcs-container{
-  margin-top: 25px;
-  border:1px solid #eeeeee;
-  border-radius: 6px 6px 0 0;
-  //红色标题
-  .pcs-header{
-    background: #05AEA3;
-    display: flex;
-    position: relative;
-    justify-content: flex-start;
-    align-items: center;
-    padding: 0;
-    height: 60px;
-    border-radius: 6px 6px 0 0;
-    .pcs-title{
-      color: #ffffff;
-      font-size: 20px;
-      font-weight: 500;
-      line-height: 20px;
-      padding: 0 50px 0 25px;
-    }
-    .pcs-status{
-      color: #ffffff;
-      font-size: 12px;
-      line-height: 20px;
-    }
-    .pcs-btns{
-      position: absolute;
-      right: 25px;
-      top: 50%;
-      transform: translateY(-50%);
-    }
-  }
-  .pcs-header.warn{
-    background-color:#FC6B69 ;
-  }
-  .pcs-header.close{
-    background-color:#666666 ;
-  }
-}
+<style lang="scss" scoped>
 </style>