Merge branch 'develop' into single-develop

This commit is contained in:
白菜
2026-01-25 16:56:29 +08:00
2 changed files with 13 additions and 5 deletions

View File

@ -29,7 +29,7 @@
<el-descriptions-item
contentClassName="descriptions-direction work-status"
:span="1" label="工作状态">
{{ workStatusOptions[baseInfo.workStatus] }}
{{ CLUSTERWorkStatusOptions[baseInfo.workStatus] }}
</el-descriptions-item>
<el-descriptions-item contentClassName="descriptions-direction"
:span="1" label="与PCS通信">
@ -136,7 +136,7 @@ export default {
components: {PointTable, pointChart},
computed: {
...mapState({
workStatusOptions: state => state?.ems?.workStatusOptions || {},
CLUSTERWorkStatusOptions: state => state?.ems?.CLUSTERWorkStatusOptions || {},
})
},
data() {
@ -175,7 +175,7 @@ export default {
methods: {
handleCardClass(item) {
const {workStatus = ''} = item
return !['0', '2'].includes(item.workStatus) ? "timing-card-container" : workStatus === '2' ? 'warning-card-container' : 'running-card-container'
return !(Object.keys(this.CLUSTERWorkStatusOptions).includes(item.workStatus)) ? "timing-card-container" : workStatus === '9' ? 'warning-card-container' : 'running-card-container'
},
// 查看设备电位表格
pointDetail(row, dataType) {