From 1378947a9e1bc60506ddb0639a614699d9c5f954 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, 25 Nov 2025 17:56:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ems/dzjk.js | 18 ++-- src/views/ems/dzjk/sbjk/bmsdcc/index.vue | 14 ++- src/views/ems/dzjk/sbjk/bmszl/index.vue | 14 ++- src/views/ems/dzjk/sbjk/db/index.vue | 14 ++- src/views/ems/dzjk/sbjk/dtdc/Table.vue | 8 +- src/views/ems/dzjk/sbjk/dtdc/index.vue | 9 ++ src/views/ems/dzjk/sbjk/pcs/index.vue | 12 ++- src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue | 5 +- src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue | 5 +- src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue | 5 +- src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue | 5 +- src/views/ems/dzjk/sbjk/ssyx/index.vue | 27 +++-- src/views/ems/dzjk/sbjk/yl/index.vue | 14 ++- src/views/ems/site/sblb/PointTable.vue | 99 +++++++++++-------- 14 files changed, 169 insertions(+), 80 deletions(-) diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js index ad1eee0..578c0f9 100644 --- a/src/api/ems/dzjk.js +++ b/src/api/ems/dzjk.js @@ -154,30 +154,30 @@ export function getClusterData({siteId,stackId,clusterId,dateTime,pageNum,pageSi // 实时运行 //储能 -export function storagePower(siteId) { +export function storagePower(siteId,startTime,endTime) { return request({ - url: `/ems/siteMonitor/runningGraph/storagePower?siteId=${siteId}`, + url: `/ems/siteMonitor/runningGraph/storagePower?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}`, method: 'get' }) } //poc温度 -export function pcsMaxTemp(siteId) { +export function pcsMaxTemp(siteId,startTime,endTime) { return request({ - url: `/ems/siteMonitor/runningGraph/pcsMaxTemp?siteId=${siteId}`, + url: `/ems/siteMonitor/runningGraph/pcsMaxTemp?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}`, method: 'get' }) } // 电池平均soc -export function batteryAveSoc(siteId) { +export function batteryAveSoc(siteId,startTime,endTime) { return request({ - url: `/ems/siteMonitor/runningGraph/batteryAveSoc?siteId=${siteId}`, + url: `/ems/siteMonitor/runningGraph/batteryAveSoc?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}`, method: 'get' }) } // 电池平均温度 -export function batteryAveTemp(siteId) { +export function batteryAveTemp(siteId,startTime,endTime) { return request({ - url: `/ems/siteMonitor/runningGraph/batteryAveTemp?siteId=${siteId}`, + url: `/ems/siteMonitor/runningGraph/batteryAveTemp?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}`, method: 'get' }) } @@ -312,4 +312,4 @@ export function getPointData({siteId,startDate,endDate}) { 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/sbjk/bmsdcc/index.vue b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue index 15ca43c..5fdbf71 100644 --- a/src/views/ems/dzjk/sbjk/bmsdcc/index.vue +++ b/src/views/ems/dzjk/sbjk/bmsdcc/index.vue @@ -8,7 +8,10 @@ 'running-card-container':baseInfo.workStatus === '0' }">
- {{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} —> ` : ''}}{{baseInfo.deviceName}} + {{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} —> ` : ''}}{{baseInfo.deviceName}} +
+ 详细 +
@@ -80,19 +83,21 @@
+ + + diff --git a/src/views/ems/site/sblb/PointTable.vue b/src/views/ems/site/sblb/PointTable.vue index ba13bef..b4653d2 100644 --- a/src/views/ems/site/sblb/PointTable.vue +++ b/src/views/ems/site/sblb/PointTable.vue @@ -10,7 +10,7 @@ destroy-on-close lock-scroll show-close - title="点位清单" + :title="dataType === 'point' ? '点位清单' : '报警点位'" width="950px" > @@ -30,14 +30,15 @@ style="width: 150px" > - - - + + + + + + + + +
- - - + + + + + + + + 搜索 @@ -81,13 +82,14 @@ label="数据点位名称" prop="pointName" > - - - + + + + + + + + { + this.getData() + }); + }, + handleCurrentChange(val) { + this.pageNum = val; + this.$nextTick(() => { + this.getData() + }); + }, + showTable({ deviceCategory, siteId, deviceId, parentId = "" },dataType) { + this.dataType = dataType; this.deviceCategory = deviceCategory; this.siteId = siteId; this.deviceId = deviceId; this.parentId = deviceCategory === "BATTERY" ? parentId : ""; //只有单体电池需要这个值 this.show = true; - this.getData(); + this.getData() + }, + getAlarmPointData(param){ + this.loading = true; + getDevicePointList(param) + .then((response) => { + this.tableData = response?.rows || []; + this.totalSize = response?.total || 0; + }) + .finally(() => { + this.loading = false; + }); + }, + getPointData(param){ + this.loading = true; + getDevicePointList(param) + .then((response) => { + this.tableData = response?.rows || []; + this.totalSize = response?.total || 0; + }) + .finally(() => { + this.loading = false; + }); }, getData() { - this.loading = true; const { siteId, deviceId, @@ -242,11 +281,11 @@ export default { dataPoint, lower, upper, - ipAddress, - ipPort, + // ipAddress, + // ipPort, }, } = this; - getDevicePointList({ + const params = { siteId, deviceId, deviceCategory, @@ -259,29 +298,10 @@ export default { dataPoint, lower, upper, - ipAddress, - ipPort, - }) - .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(); - }); + ipAddress:'', + ipPort:'', + } + this.dataType === 'point' ? this.getPointData(params) : this.getAlarmPointData(params) }, }, }; diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue index 81910a7..f18ad60 100644 --- a/src/views/ems/site/sblb/index.vue +++ b/src/views/ems/site/sblb/index.vue @@ -13,12 +13,6 @@ 新增设备 - - 上传点位清单 -