diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js index 3468418..a58ba92 100644 --- a/src/api/ems/dzjk.js +++ b/src/api/ems/dzjk.js @@ -54,3 +54,18 @@ export function getClusterNameList(stackDeviceId) { }) } +//获取液冷列表数据 +export function getCoolingDataList(siteId) { + return request({ + url: `/ems/siteMonitor/getCoolingDataList?siteId=${siteId}`, + method: 'get' + }) +} + +//获取电表数据 +export function getAmmeterDataList(siteId) { + return request({ + url: `/ems/siteMonitor/getAmmeterDataList?siteId=${siteId}`, + method: 'get' + }) +} diff --git a/src/components/Ems/ZdBaseInfo/index.vue b/src/components/Ems/ZdBaseInfo/index.vue index a10c2b0..b08dd32 100644 --- a/src/components/Ems/ZdBaseInfo/index.vue +++ b/src/components/Ems/ZdBaseInfo/index.vue @@ -23,13 +23,13 @@ export default { title:'装机功率(MW)', num:'', color:'#3C81FF', - attr:'installedPower' + attr:'installPower' },{ title:'装机容量(MW)', num:'', color:'#5AC7C0', - attr:'installedCap' + attr:'installCapacity' },{ title:'总充电量(MWh)', diff --git a/src/components/Ems/ZdSelect/index.vue b/src/components/Ems/ZdSelect/index.vue index 540b509..83e85cc 100644 --- a/src/components/Ems/ZdSelect/index.vue +++ b/src/components/Ems/ZdSelect/index.vue @@ -4,7 +4,7 @@ - + @@ -28,7 +28,7 @@ import {mapGetters} from "vuex" required:false }, defaultSiteId:{//默认展示的站点ID - type:String|Number, + type:String, default:'', required:false } @@ -49,11 +49,11 @@ import {mapGetters} from "vuex" this.$emit('submitSite',this.id) }, setDefaultSite(){ - const defaultSite = parseInt(this.defaultSiteId) - if(defaultSite && this.siteList.find(item=>item.id === defaultSite)){ + const defaultSite = this.defaultSiteId + if(defaultSite && this.siteList.find(item=>item.siteId === defaultSite)){ this.id = defaultSite }else if(!defaultSite && this.siteList.length>0){ - this.id = this.siteList[0].id + this.id = this.siteList[0].siteId } this.$emit('submitSite',this.id) }, diff --git a/src/store/modules/ems.js b/src/store/modules/ems.js index 4d234ad..f34c9cd 100644 --- a/src/store/modules/ems.js +++ b/src/store/modules/ems.js @@ -1,6 +1,13 @@ const ems = { state: { - zdList:[] + zdList:[], + workStatusOptions:{'0':'正常','1':'异常','2':'停止'},//工作状态 + deviceStatusOptions:{'0':'在线','1':'离线','2':'维修中'},//设备状态 + gridStatusOptions:{'0':'并网','1':'未并网'},//并网状态 + controlModeOptions:{'0':'远程','1':'本地'},//控制模式 + warnOptions:{0:'正常', 1:'中断', 2:'不在线',3:'异常'},//告警状态 + communicationStatusOptions:{'0':'正常','1':'通讯中断','2':'异常'},//通讯状态 + workModeOptions:{'0':'正常','1':'停止'},//工作模式 }, mutations: { SET_ZD_LIST(state, list) { diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue index 088c612..0103afb 100644 --- a/src/views/ems/dzjk/home/index.vue +++ b/src/views/ems/dzjk/home/index.vue @@ -37,7 +37,7 @@ label="状态" >
- {{baseInfo.workStatus}} - {{baseInfo.pcsCommunicationStatus}} - {{baseInfo.emsCommunicationStatus}} + {{$store.state.ems.workStatusOptions[baseInfo.workStatus]}} + {{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}} + {{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}
diff --git a/src/views/ems/dzjk/sbjk/bmszl/index.vue b/src/views/ems/dzjk/sbjk/bmszl/index.vue index 3fbf510..4c7e618 100644 --- a/src/views/ems/dzjk/sbjk/bmszl/index.vue +++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue @@ -8,9 +8,9 @@
- {{baseInfo.workStatus}} - {{baseInfo.pcsCommunicationStatus}} - {{baseInfo.emsCommunicationStatus}} + {{$store.state.ems.workStatusOptions[baseInfo.workStatus]}} + {{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}} + {{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}
diff --git a/src/views/ems/dzjk/sbjk/db/index.vue b/src/views/ems/dzjk/sbjk/db/index.vue index 1b9ab11..ec5e0ff 100644 --- a/src/views/ems/dzjk/sbjk/db/index.vue +++ b/src/views/ems/dzjk/sbjk/db/index.vue @@ -1,46 +1,47 @@