@@ -71,25 +72,20 @@ export default {
return time.getFullYear() >= new Date().getFullYear()+1;
},
},
- priceTypeOptions:[{
- id:'peak',
- name:'尖',
- },{
- id:'high',
- name:'峰',
- },{
- id:'flat',
- name:'平',
- },{
- id:'valley',
- name:'谷',
- }],
+ priceTypeOptions:{
+ 'peak':'尖',
+ 'high':'峰',
+ 'flat':'平',
+ 'valley':'谷'
+ },
}
},
methods:{
+ changeDefaultYear(){
+ this.getData();
+ },
getData(){
this.loading=true;
- console.log('this.defaultYear=====',this.defaultYear)
const date = new Date(this.defaultYear).getFullYear()
const startTime = date+'-01',endTime = date+'-12'
listPriceConfig({startTime,endTime,pageNum:1,pageSize:20}).then(response => {
@@ -109,7 +105,7 @@ export default {
beforeClose: (action, instance, done) => {
if (action === 'confirm') {
instance.confirmButtonLoading = true;
- energyPriceConfig({id:row.id}).then(response => {
+ energyPriceConfig(row.id).then(response => {
response.code === 200 && done();
}).finally(() => {
instance.confirmButtonLoading = false;
@@ -140,14 +136,12 @@ export default {
\ No newline at end of file
+
diff --git a/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue b/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
index 27871a3..409859d 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/ChartDetail.vue
@@ -10,13 +10,17 @@
class="ems-dialog chart-detail-dialog"
:before-close="handleColsed"
>
-
+
@@ -28,7 +32,7 @@ import resize from "@/mixins/ems/resize";
import { getSingleBatteryData } from "@/api/ems/dzjk";
import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
export default {
- components: {DateRangeSelect},
+ components: { DateRangeSelect },
mixins: [resize],
data() {
return {
@@ -48,9 +52,9 @@ export default {
},
methods: {
// 更新时间范围 重置图表
- updateDate(data){
- this.dateRange=data || []
- this.getData()
+ updateDate(data) {
+ this.dateRange = data || [];
+ this.getData();
},
handleColsed(done) {
if (!this.chart) {
@@ -94,7 +98,7 @@ export default {
this.$nextTick(() => {
!this.chart &&
(this.chart = echarts.init(document.querySelector("#lineChart")));
- this.$refs.dateRangeSelect.init()
+ this.$refs.dateRangeSelect.init();
});
},
setOption(data) {
@@ -148,7 +152,6 @@ export default {
},
];
}
-
this.chart &&
this.chart.setOption({
color: ["#FFBD00", "#3C81FF", "#05AEA3", "#F86F70"],
@@ -186,10 +189,10 @@ export default {
};
+
diff --git a/src/views/ems/site/sblb/PointTable.vue b/src/views/ems/site/sblb/PointTable.vue
index 232d95f..7a4ce1f 100644
--- a/src/views/ems/site/sblb/PointTable.vue
+++ b/src/views/ems/site/sblb/PointTable.vue
@@ -1,6 +1,7 @@
-
+
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ scope.row.pointValue }}
+
+
+
+
+
+
+
-
-
+ >
+
+
+
+
\ No newline at end of file
+
From fef1704cbdaf15660a8212a8efbcc0cb037f7cda 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, 13 Oct 2025 17:01:13 +0800
Subject: [PATCH 28/40] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=BA=A2=E7=82=B9?=
=?UTF-8?q?=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/ems.js | 16 ++++++++-
src/views/ems/dzjk/gzgj/index.vue | 2 +-
src/views/ems/dzjk/index.vue | 41 +++++++++++++++++-------
src/views/ems/dzjk/sbjk/index.vue | 5 ---
src/views/ems/site/powerTariff/index.vue | 2 +-
5 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js
index 31b33ba..b80f590 100644
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@@ -1,5 +1,7 @@
+import {getAlarmDetailList} from'@/api/ems/dzjk'
const ems = {
state: {
+ dzjkAlarmLighting:false,//单站监控 告警统计红点标志
zdList:[],
workStatusOptions:{'0':'正常','1':'异常','2':'停止'},//工作状态
deviceStatusOptions:{'0':'在线','1':'离线','2':'维修中'},//设备状态
@@ -19,8 +21,20 @@ const ems = {
mutations: {
SET_ZD_LIST(state, list) {
state.zdList = list || []
- }
+ },
+ SET_DZJK_ALARM_LIGHTING(state, status) {
+ state.dzjkAlarmLighting = status
+ },
},
+ actions: {
+ //查询站点的所有待处理0的告警 存在展示红点标志
+ getSiteAlarmNum({state,commit},siteId){
+ console.log('页面进入单站监控或切换站点ID或在告警统计页面调用了告警list接口',siteId)
+ getAlarmDetailList({status:0,siteId,pageSize:10,pageNum:1,deviceId:'',alarmLevel:'',alarmStartTime:'',alarmEndTime:''}).then(response=>{
+ commit('SET_DZJK_ALARM_LIGHTING',!!response?.total || false)
+ })
+ }
+ }
}
export default ems
diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue
index 899e04a..bfff9d3 100644
--- a/src/views/ems/dzjk/gzgj/index.vue
+++ b/src/views/ems/dzjk/gzgj/index.vue
@@ -179,7 +179,6 @@ export default {
// 搜索
onSearch(){
this.pageNum =1//每次搜索从1开始搜索
- const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
this.getData()
},
// 重置
@@ -199,6 +198,7 @@ export default {
},
// 获取数据
getData(){
+ this.$store.dispatch('getSiteAlarmNum',this.siteId)
this.loading=true
const {deviceId,alarmLevel} = this.search
const {siteId,pageNum,pageSize,activeBtn} =this
diff --git a/src/views/ems/dzjk/index.vue b/src/views/ems/dzjk/index.vue
index 92e3eb3..0986c66 100644
--- a/src/views/ems/dzjk/index.vue
+++ b/src/views/ems/dzjk/index.vue
@@ -11,10 +11,10 @@
active-text-color="#ffffff"
mode="horizontal"
>
-
-
- {{item.meta.title}}
-
+
+
+ {{item.meta.title}}
+
@@ -30,6 +30,7 @@ import { dzjk } from '@/router/ems'
const childrenRoute = dzjk[0].children[0].children//获取到单站监控下面的字路由
console.log('childrenRoute',childrenRoute)
import ZdSelect from '@/components/Ems/ZdSelect/index.vue'
+import {mapState} from "vuex";
export default {
components:{ZdSelect},
data(){
@@ -38,14 +39,21 @@ export default {
activeMenu:''
}
},
+ computed:{
+ ...mapState({
+ dzjkAlarmLighting:state=>state.ems.dzjkAlarmLighting
+ })
+ },
methods:{
submitSite(id){
- if(id != this.$route.query.siteId){
- console.log('单站监控选择了其他的站点id=',id,'并更新页面地址参数')
+ if(id !== this.$route.query.siteId){
+ // console.log('单站监控选择了其他的站点id=',id,'并更新页面地址参数')
this.$router.push({query:{...this.$route.query,siteId:id}})
}else{
- console.log('单站监控选择了相同的其他的站点id=',id,'页面地址不发生改变')
+ // console.log('单站监控选择了相同的其他的站点id=',id,'页面地址不发生改变')
}
+ //获取告警列表数据
+ this.$store.dispatch('getSiteAlarmNum',id)
}
},
beforeRouteLeave(to,from, next){
@@ -54,10 +62,6 @@ export default {
this.$store.commit('SET_ZD_LIST',[])
next()
},
- mounted() {
- console.log('单站监控一级页面路由',this.$route)
- }
-
}
@@ -65,4 +69,19 @@ export default {
.dzjk-ems-content-container{
margin-top:0;
}
+ .lighting{
+ position: relative;
+ z-index: 1;
+ &::after{
+ content:"";
+ display: block;
+ background-color: red;
+ height: 10px;
+ width: 10px;
+ border-radius: 100%;
+ position: absolute;
+ right: -2px;
+ top: -2px;
+ }
+ }
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index a6bf13a..1ef3731 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -25,7 +25,6 @@
diff --git a/src/views/ems/site/powerTariff/index.vue b/src/views/ems/site/powerTariff/index.vue
index 3344caa..89710d2 100644
--- a/src/views/ems/site/powerTariff/index.vue
+++ b/src/views/ems/site/powerTariff/index.vue
@@ -72,7 +72,7 @@ export default {
return {
loading:false,
pageNum:1,
- pageSize:10,
+ pageSize:40,
searchLoading:false,
siteId:'',
siteList:[],
From fb0eda456512544559c793c8bdb2327090fa8b01 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, 15 Oct 2025 14:26:06 +0800
Subject: [PATCH 29/40] =?UTF-8?q?=E5=8D=95=E7=AB=99=E7=9B=91=E6=8E=A7-?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95,=E7=82=B9=E4=BD=8D?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ems/dzjk.js | 8 ++-
src/api/ems/site.js | 4 +-
src/router/ems.js | 14 +++---
src/store/modules/ems.js | 15 +++++-
src/views/ems/dzjk/sbjk/index.vue | 68 ++++++++++++++++++--------
src/views/ems/site/sblb/PointTable.vue | 30 ++++++------
6 files changed, 91 insertions(+), 48 deletions(-)
diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index 7b56570..ad1eee0 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -14,7 +14,13 @@ export function getSevenChargeData({siteId,startDate,endDate}) {
method: 'get'
})
}
-
+// 获取站点包含的设备种类 用来判断单站监控设备监控的菜单栏展示
+export function getSiteAllDeviceCategory(siteId) {
+ return request({
+ url: `/ems/siteConfig/getSiteAllDeviceCategory?siteId=${siteId}`,
+ method: 'get'
+ })
+}
//获取pcs、实时运行头部的设备信息
export function getRunningHeadInfo(siteId) {
return request({
diff --git a/src/api/ems/site.js b/src/api/ems/site.js
index ea68371..a94155b 100644
--- a/src/api/ems/site.js
+++ b/src/api/ems/site.js
@@ -64,9 +64,9 @@ export function getDeviceList(siteId) {
}
//获取设备点位table
-export function getDevicePointList({siteId,deviceId,deviceCategory,pageNum,pageSize,dataPointName='',sortMethod,dataPoint,lower,upper}) {
+export function getDevicePointList({siteId,deviceId,deviceCategory,pageNum,pageSize,dataPointName='',sortMethod,sortData,dataPoint,lower,upper}) {
return request({
- url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&deviceId=${deviceId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}&dataPointName=${dataPointName}&dataPoint=${dataPoint}&lower=${lower}&upper=${upper}&pageNum=${pageNum}&sortMethod=${sortMethod}`,
+ url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&deviceId=${deviceId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}&dataPointName=${dataPointName}&dataPoint=${dataPoint}&lower=${lower}&upper=${upper}&pageNum=${pageNum}&sortMethod=${sortMethod}&sortData=${sortData}`,
method: 'get',
})
}
\ No newline at end of file
diff --git a/src/router/ems.js b/src/router/ems.js
index b07a0e6..e00873a 100644
--- a/src/router/ems.js
+++ b/src/router/ems.js
@@ -42,43 +42,43 @@ export const dzjk=[
path: 'ssyx',
component: () => import('@/views/ems/dzjk/sbjk/ssyx/index.vue'),
name: 'DzjkSbjkSsyx',
- meta: { title: '实时运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: '实时运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'SSYX'},
},
{
path: 'pcs',
component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
name: 'DzjkSbjkPcs',
- meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'PCS'},
},
{
path: 'bmszl',
component: () => import('@/views/ems/dzjk/sbjk/bmszl/index.vue'),
name: 'DzjkSbjkBmszl',
- meta: { title: 'BMS总览',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: 'BMS总览',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk', categoryName:'STACK'},
},
{
path: 'bmsdcc',
component: () => import('@/views/ems/dzjk/sbjk/bmsdcc/index.vue'),
name: 'DzjkSbjkBmsdcc',
- meta: { title: 'BMS电池簇',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: 'BMS电池簇',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'CLUSTER'},
},
{
path: 'dtdc',
component: () => import('@/views/ems/dzjk/sbjk/dtdc/index.vue'),
name: 'DzjkSbjkDtdc',
- meta: { title: '单体电池',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: '单体电池',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'BATTERY'},
},
{
path: 'db',
component: () => import('@/views/ems/dzjk/sbjk/db/index.vue'),
name: 'DzjkSbjkDb',
- meta: { title: '电表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: '电表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'AMMETER'},
},
{
path: 'yl',
component: () => import('@/views/ems/dzjk/sbjk/yl/index.vue'),
name: 'DzjkSbjkYl',
- meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+ meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk',categoryName:'COOLING'},
}
]
},
diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js
index b80f590..00678be 100644
--- a/src/store/modules/ems.js
+++ b/src/store/modules/ems.js
@@ -1,8 +1,9 @@
-import {getAlarmDetailList} from'@/api/ems/dzjk'
+import {getAlarmDetailList,getSiteAllDeviceCategory} from'@/api/ems/dzjk'
const ems = {
state: {
dzjkAlarmLighting:false,//单站监控 告警统计红点标志
zdList:[],
+ zdDeviceCategoryOptions:{},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...}
workStatusOptions:{'0':'正常','1':'异常','2':'停止'},//工作状态
deviceStatusOptions:{'0':'在线','1':'离线','2':'维修中'},//设备状态
gridStatusOptions:{'0':'并网','1':'未并网'},//并网状态
@@ -25,15 +26,25 @@ const ems = {
SET_DZJK_ALARM_LIGHTING(state, status) {
state.dzjkAlarmLighting = status
},
+ SET_ZD_DEVICE_CATEGORY_OPTIONS(state,{siteId,data}){
+ state.zdDeviceCategoryOptions = Object.assign({}, state.zdDeviceCategoryOptions, {[siteId]:data})
+ }
},
actions: {
//查询站点的所有待处理0的告警 存在展示红点标志
getSiteAlarmNum({state,commit},siteId){
- console.log('页面进入单站监控或切换站点ID或在告警统计页面调用了告警list接口',siteId)
getAlarmDetailList({status:0,siteId,pageSize:10,pageNum:1,deviceId:'',alarmLevel:'',alarmStartTime:'',alarmEndTime:''}).then(response=>{
commit('SET_DZJK_ALARM_LIGHTING',!!response?.total || false)
})
+ },
+ getSiteDeviceCategory({state,commit},siteId){
+ getSiteAllDeviceCategory(siteId).then(response=>{
+ let data = response?.data || [];
+ data.unshift('SSYX');
+ commit('SET_ZD_DEVICE_CATEGORY_OPTIONS',{siteId,data})
+ })
}
+
}
}
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index 1ef3731..14082d8 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -1,38 +1,66 @@
-
- {{scope.row.avgData}}
+ {{scope.row.avgData}}
- {{scope.row.minData}}
+ {{scope.row.minData}}
- {{scope.row.maxData}}
+ {{scope.row.maxData}}
- {{scope.row.clusterVoltage}} V
+ {{scope.row.clusterVoltage}} V
- {{scope.row.clusterCurrent}} A
+ {{scope.row.clusterCurrent}} A
- {{scope.row.currentSoc}} %
+ {{scope.row.currentSoc}} %
- {{scope.row.maxCellVoltage}} V
+ {{scope.row.maxCellVoltage}} V
- {{scope.row.minCellVoltage}} V
+ {{scope.row.minCellVoltage}} V
- {{scope.row.maxCellTemp}} ℃
+ {{scope.row.maxCellTemp}} ℃
- {{scope.row.minCellTemp}} ℃
+ {{scope.row.minCellTemp}} ℃
-
+
{{tempDataItem.name}}：{{item[tempDataItem.attr]}}
@@ -140,9 +140,8 @@ export default {
};
},
methods: {
- showChart(pointName,categoryName,deviceId){
- console.log('点击查询图表',pointName,categoryName,deviceId)
- pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+ showChart(pointName,deviceId){
+ pointName && this.$refs.pointChart.showChart({pointName,deviceCategory:'AMMETER',deviceId})
},
updateData(){
this.loading = true;
diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue
index c2e3967..3353df4 100644
--- a/src/views/ems/dzjk/sbjk/dtdc/index.vue
+++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue
@@ -174,7 +174,7 @@ export default {
dataType &&
this.$refs.pointChart.showChart({
pointName: dataType,
- categoryName: "单体电池",
+ deviceCategory:'BATTERY',
deviceId: clusterDeviceId,
child: [deviceId],
});
diff --git a/src/views/ems/dzjk/sbjk/index.vue b/src/views/ems/dzjk/sbjk/index.vue
index 14082d8..b283908 100644
--- a/src/views/ems/dzjk/sbjk/index.vue
+++ b/src/views/ems/dzjk/sbjk/index.vue
@@ -38,10 +38,10 @@ export default {
return this.zdDeviceCategoryOptions[this.siteId] || []
},
categoryRouter(){
- const routeData =this.childrenRoute.filter(item=>this.locationSiteCategory.includes(item.meta.categoryName))
+ const routeData =this.childrenRoute.filter(item=>this.locationSiteCategory.includes(item.meta.deviceCategory))
if(this.siteId && routeData.length > 0 && this.locationSiteCategory && this.locationSiteCategory.length >1){
- const locationPageCategoryName = this.$route.meta?.categoryName || ''
- if(!routeData.some(item=> item.meta.categoryName===locationPageCategoryName)){
+ const locationPageDeviceCategory = this.$route.meta?.deviceCategory || ''
+ if(!routeData.some(item=> item.meta.deviceCategory===locationPageDeviceCategory)){
this.$router.replace({path:'/dzjk/sbjk/ssyx',query:this.$route.query})
}
}
diff --git a/src/views/ems/dzjk/sbjk/pcs/index.vue b/src/views/ems/dzjk/sbjk/pcs/index.vue
index fb92639..2af43ea 100644
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@@ -100,7 +100,7 @@
{{ pcsItem[item.attr] | formatNumber }}
@@ -136,7 +136,7 @@
>
{{ item.dcPower }}kW
@@ -148,7 +148,7 @@
>
{{ item.dcVoltage }}V
@@ -160,7 +160,7 @@
>
{{ item.dcCurrent }}A
@@ -169,7 +169,6 @@