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

Merge branch 'develop' into single-develop

Browse Source 
# Conflicts:
#	src/router/ems.js
This commit is contained in:
白菜
2026-01-16 15:59:17 +08:00
parent 80f07876c6 11111d035b
commit b122ab35ab
7 changed files with 172 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
<el-col v-for="(tempDataItem,tempDataIndex) in deviceIdTypeMsg[item.deviceId]" :key="tempDataIndex+'dbTempData'"
:span="8" class="device-info-col">
<span class="pointer" @click="showChart(tempDataItem.pointName,item.deviceId)">
<span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
<span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] || '-' }}<span
v-html="tempDataItem.unit"></span></span>
</span>
</el-col>

3
src/views/ems/dzjk/sbjk/dh/index.vue
View File

@ -26,7 +26,8 @@
<el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
class="device-info-col">
<span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
<span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
<span class="left">{{ tempDataItem.title }}</span> <span
class="right">{{ item[tempDataItem.attr] || '-' }}<span
v-html="tempDataItem.unit"></span></span>
</span>
</el-col>

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

@ -209,10 +209,10 @@ export default {
pcsList: [],
infoData: [
{
label: "总交流有功电率",
label: "总交流有功功率",
attr: "totalActivePower",
unit: "kW",
pointName: "总交流有功电率",
pointName: "总交流有功功率",
},
{
label: "当天交流充电量",
@ -228,10 +228,10 @@ export default {
pointName: "A相电流",
},
{
label: "总交流无功电率",
label: "总交流无功功率",
attr: "totalReactivePower",
unit: "kVar",
pointName: "总交流无功电率",
pointName: "总交流无功功率",
},
{
label: "当天交流放电量",

6
src/views/ems/dzjk/sbjk/xf/index.vue
View File

@ -37,8 +37,10 @@
<el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
class="device-info-col">
<span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
<span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] || '' }}<span
v-html="tempDataItem.unit"></span></span>
<span class="left">{{ tempDataItem.title }}</span> <span class="right">{{
item[tempDataItem.attr] || '-'
}}<span
v-html="tempDataItem.unit"></span></span>
</span>
</el-col>
</el-row>

3
src/views/ems/dzjk/sbjk/yl/index.vue
View File

@ -26,7 +26,8 @@
<el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'ylTempData'" :span="8"
class="device-info-col">
<span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
<span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
<span class="left">{{ tempDataItem.title }}</span> <span
class="right">{{ item[tempDataItem.attr] || '-' }}<span
v-html="tempDataItem.unit"></span></span>
</span>
</el-col>