Merge branch 'develop' into single-develop

This commit is contained in:
白菜
2025-11-05 14:10:00 +08:00
59 changed files with 4535 additions and 1971 deletions

View File

@ -34,10 +34,10 @@
<div
class="status"
:class="
item.communicationStatus === '0' ? 'status-running' : ''
item.runningStatus === '2' ? 'status-running' : ''
"
>
{{ communicationStatusOptions[item.communicationStatus] }}
{{ deviceStatusOptions[item.runningStatus] }}
</div>
<div class="row-items-img">
<img
@ -68,10 +68,10 @@
<div
class="status"
:class="
item.communicationStatus === '0' ? 'status-running' : ''
item.runningStatus === '2' ? 'status-running' : ''
"
>
{{ communicationStatusOptions[item.communicationStatus] }}
{{ deviceStatusOptions[item.runningStatus] }}
</div>
<div class="row-items-img">
<img
@ -107,10 +107,10 @@
<div
class="status"
:class="
item.communicationStatus === '0' ? 'status-running' : ''
item.runningStatus === '2' ? 'status-running' : ''
"
>
{{ communicationStatusOptions[item.communicationStatus] }}
{{ deviceStatusOptions[item.runningStatus] }}
</div>
<div class="row-items-img row-items-img-bms">
<div style="position:relative;">
@ -150,10 +150,10 @@
<div
class="status"
:class="
item.communicationStatus === '0' ? 'status-running' : ''
item.runningStatus === '2' ? 'status-running' : ''
"
>
{{ communicationStatusOptions[item.communicationStatus] }}
{{ deviceStatusOptions[item.runningStatus] }}
</div>
<div class="row-items-img">
<img
@ -171,14 +171,14 @@
<div
class="status"
:class="
item.children[0].communicationStatus === '0'
item.children[0].runningStatus === '2'
? 'status-running'
: ''
"
>
{{
communicationStatusOptions[
item.children[0].communicationStatus
deviceStatusOptions[
item.children[0].runningStatus
]
}}
</div>
@ -222,8 +222,8 @@ export default {
},
computed: {
...mapState({
communicationStatusOptions: (state) =>
state.ems.communicationStatusOptions,
deviceStatusOptions: (state) =>
state.ems.deviceStatusOptions,
}),
showPcs() {