From 823c0949d0728af7d6d88850ac1deb002f96ba96 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, 21 Jan 2026 18:58:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=BF=90=E8=A1=8C=E5=9B=BE=E8=A1=A8=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=AB=99=E7=82=B9=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,=E7=94=B5?= =?UTF-8?q?=E8=A1=A8=E6=9C=AA=E7=9F=A5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Ems/ZdBaseInfo/index.vue | 4 +- src/views/ems/dzjk/sbjk/db/index.vue | 60 ++++++---- src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue | 106 +++++++++--------- src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue | 4 +- src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue | 4 +- src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue | 4 +- 6 files changed, 102 insertions(+), 80 deletions(-) diff --git a/src/components/Ems/ZdBaseInfo/index.vue b/src/components/Ems/ZdBaseInfo/index.vue index e18693a..8028c33 100644 --- a/src/components/Ems/ZdBaseInfo/index.vue +++ b/src/components/Ems/ZdBaseInfo/index.vue @@ -32,13 +32,13 @@ export default { attr:'installCapacity' },{ - title:'总充电量(MWh)', + title:'总充电量(KWh)', num:'', color:'#A696FF', attr:'totalChargedCap' },{ - title:'总放电量(MWh)', + title:'总放电量(KWh)', num:'', color:'#A696FF', attr:'totalDischargedCap' diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue index 42fe458..cced76a 100644 --- a/src/views/ems/dzjk/sbjk/db/index.vue +++ b/src/views/ems/dzjk/sbjk/db/index.vue @@ -35,13 +35,19 @@ - + + @@ -70,86 +76,102 @@ export default { { name: '正向有功电能', attr: 'forwardActive', - pointName: '正向有功电能' + pointName: '正向有功电能', + unit: 'kWh' }, { name: '反向有功电能', attr: 'reverseActive', - pointName: '反向有功电能' + pointName: '反向有功电能', + unit: 'kWh' }, { name: '正向无功电能', attr: 'forwardReactive', - pointName: '正向无功电能' + pointName: '正向无功电能', + unit: 'kvarh' }, { name: '反向无功电能', attr: 'reverseReactive', - pointName: '反向无功电能' + pointName: '反向无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ], 'METE': [ { name: '正向有功电能', attr: 'forwardActive', - pointName: '正向有功电能' + pointName: '正向有功电能', + unit: 'kWh' }, { name: '反向有功电能', attr: 'reverseActive', - pointName: '反向有功电能' + pointName: '反向有功电能', + unit: 'kWh' }, { name: '正向无功电能', attr: 'forwardReactive', - pointName: '正向无功电能' + pointName: '正向无功电能', + unit: 'kvarh' }, { name: '反向无功电能', attr: 'reverseReactive', - pointName: '反向无功电能' + pointName: '反向无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ], 'METEGF': [ { name: '有功电能', attr: 'activeEnergy', - pointName: '有功电能' + pointName: '有功电能', + unit: 'kWh' }, { name: '无功电能', attr: 'reactiveEnergy', - pointName: '无功电能' + pointName: '无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ] } diff --git a/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue b/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue index 202d844..0c2d6b8 100644 --- a/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue +++ b/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue @@ -1,12 +1,12 @@ @@ -14,7 +14,7 @@ diff --git a/src/views/ems/dzjk/home/ActiveChart.vue b/src/views/ems/dzjk/home/ActiveChart.vue index b0815c9..1df41b1 100644 --- a/src/views/ems/dzjk/home/ActiveChart.vue +++ b/src/views/ems/dzjk/home/ActiveChart.vue @@ -1,30 +1,29 @@ - diff --git a/src/views/ems/dzjk/zxlt/index copy 2.vue b/src/views/ems/dzjk/zxlt/index copy 2.vue deleted file mode 100644 index b367064..0000000 --- a/src/views/ems/dzjk/zxlt/index copy 2.vue +++ /dev/null @@ -1,577 +0,0 @@ - - - - - diff --git a/src/views/ems/dzjk/zxlt/index copy.vue b/src/views/ems/dzjk/zxlt/index copy.vue deleted file mode 100644 index ce2defa..0000000 --- a/src/views/ems/dzjk/zxlt/index copy.vue +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - From bfe72cf2c33cd281e9b1d420ea5f2a185eafd81c 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, 23 Jan 2026 14:18:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E6=94=B6=E7=9B=8A=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ems/dzjk/home/index.vue | 14 ++----- src/views/ems/dzjk/sbjk/db/index.vue | 35 ++++++++++++----- src/views/ems/dzjk/tjbb/sybb/index.vue | 53 +++++--------------------- 3 files changed, 38 insertions(+), 64 deletions(-) diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue index f06e78e..b2f9b1b 100644 --- a/src/views/ems/dzjk/home/index.vue +++ b/src/views/ems/dzjk/home/index.vue @@ -57,10 +57,6 @@ - - - - - - + @@ -174,7 +169,27 @@ export default { unit: 'kvar' } ] - } + }, + otherTypeMsg: [ + { + name: '正向有功电能', + attr: 'forwardActive', + pointName: '正向有功电能', + unit: 'kWh' + }, + { + name: '反向有功电能', + attr: 'reverseActive', + pointName: '反向有功电能', + unit: 'kWh' + }, + { + name: '有功功率', + attr: 'activePower', + pointName: '总有功功率', + unit: 'kW' + }, + ] }; }, methods: { diff --git a/src/views/ems/dzjk/tjbb/sybb/index.vue b/src/views/ems/dzjk/tjbb/sybb/index.vue index b065736..c1237a9 100644 --- a/src/views/ems/dzjk/tjbb/sybb/index.vue +++ b/src/views/ems/dzjk/tjbb/sybb/index.vue @@ -27,15 +27,14 @@ class="common-table" :data="tableData" show-summary - :summary-method="getSummaries" stripe style="width: 100%;margin-top:25px;"> - + + min-width="100px" align="center"> @@ -94,6 +93,14 @@ label="总"> + + + + + { - if (index === 0) { - const activeTotal = data.map(item => item.activeTotalPrice).reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return prev + curr; - } else { - return prev; - } - }, 0); - const reActiveTotal = data.map(item => item.reActiveTotalPrice).reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return prev + curr; - } else { - return prev; - } - }, 0); - sums[index] = '价差收入 : ' + (reActiveTotal - activeTotal); - return - } - const values = data.map(item => Number(item[column.property])); - if (!values.every(value => isNaN(value))) { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return prev + curr; - } else { - return prev; - } - }, 0); - } - }) - return sums - }, // 搜索 onSearch() { this.pageNum = 1//每次搜索从1开始搜索 From f454b02c99af427b0b9ff5ac995b686c67c30ee4 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, 23 Jan 2026 16:30:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?pcs=E3=80=81bmszl=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/common.scss | 12 ++++++++++ src/store/modules/ems.js | 2 ++ src/views/ems/dzjk/sbjk/bmszl/index.vue | 25 ++++++++++++++------- src/views/ems/dzjk/sbjk/pcs/index.vue | 29 +++++++++++-------------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss index 109825f..2ad5343 100644 --- a/src/assets/styles/common.scss +++ b/src/assets/styles/common.scss @@ -104,6 +104,10 @@ .el-card__header { background-color: #b64040; //#fc6b69; } + + .work-status { + color: #b64040 !important;; + } } //绿色背景颜色标题 @@ -111,6 +115,10 @@ .el-card__header { background-color: #40b6a5; //#05aea3; } + + .work-status { + color: #40b6a5 !important; + } } //灰色背景颜色标题 @@ -118,6 +126,10 @@ .el-card__header { background-color: #666666; } + + .work-status { + color: #666666 !important;; + } } } diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js index bec3904..3dcb358 100644 --- a/src/store/modules/ems.js +++ b/src/store/modules/ems.js @@ -6,6 +6,8 @@ const ems = { zdList: [], zdDeviceCategoryOptions: {},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...} workStatusOptions: {'0': '运行', '1': '停机', '2': '故障'},//工作状态 + PCSWorkStatusOptions: {'0': '运行', '1': '停机', '2': '故障', '3': '待机', '4': '充电', '5': '放电'},//PCS工作状态 + STACKWorkStatusOptions: {"0": "净置", "1": "充电", "2": "放电", "3": "浮充", '9': "故障"},//STACK电池簇工作状态 deviceStatusOptions: {'0': '离线', '1': '在线'},//设备状态 gridStatusOptions: {'0': '并网', '1': '未并网'},//并网状态 controlModeOptions: {'0': '远程', '1': '本地'},//控制模式 diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue index 761002b..65cfd0d 100644 --- a/src/views/ems/dzjk/sbjk/bmszl/index.vue +++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue @@ -1,12 +1,10 @@ + + + \ No newline at end of file diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 75cfc8e..df8393d 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,19 +1,24 @@