xzzn/emsfront
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop_cloud #1

Merged
dashixiong merged 234 commits from develop_cloud into main-cloud 2026-02-11 02:06:04 +00:00
Conversation 0 Commits 234 Files Changed 137 +11969 -30
107 changed files with 11969 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52b6083baa - Show all commits

2
src/views/ems/dzjk/sbjk/PointChart.vue
View File

@ -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()

2
src/views/ems/dzjk/sbjk/bmsdcc/index.vue
View File

@ -105,7 +105,7 @@ export default {
'温度单体平均值':'温度平均值',
'温度单体最大值':'最高单体温度',
'SOC单体最小值':'最低单体SOC',
'SOC单体平均值':'',
'SOC单体平均值':'当前SOC',
'SOC单体最大值':'最高单体SOC',
},
baseInfoList:[],

12
src/views/ems/dzjk/sbjk/db/index.vue
View File

@ -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){

2
src/views/ems/dzjk/sbjk/pcs/index.vue
View File

@ -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>