develop #1

Merged
dashixiong merged 37 commits from develop into main 2026-02-11 02:07:35 +00:00
65 changed files with 21921 additions and 6464 deletions
Showing only changes of commit 3676313439 - Show all commits

View File

@ -7,7 +7,7 @@
<template v-slot:title>
<view class='title-wrapper'>
<view class="top">
<view class="status">{{workStatusOptions[item.workStatus] || '暂无数据'}}</view>
<view class="status">{{CLUSTERWorkStatusOptions[item.workStatus] || '暂无数据'}}</view>
<text
class="name">{{`${item.parentDeviceName?`${item.parentDeviceName} -> ` : ''}${item.deviceName}`}}</text>
</view>
@ -21,7 +21,7 @@
<view class="grid-item-box">
<view class="title">工作状态</view>
<text
class="text work-status-color">{{workStatusOptions[item.workStatus] || '-'}}</text>
class="text work-status-color">{{CLUSTERWorkStatusOptions[item.workStatus] || '-'}}</text>
</view>
</view>
<view class="flex-lists">
@ -99,8 +99,8 @@
export default {
computed: {
...mapState({
workStatusOptions: (state) =>
state.ems.workStatusOptions,
CLUSTERWorkStatusOptions: (state) =>
state.ems.CLUSTERWorkStatusOptions,
communicationStatusOptions: (state) =>
state.ems.communicationStatusOptions,
})
@ -183,8 +183,8 @@
const {
workStatus = ''
} = item
return !['0', '2'].includes(item.workStatus) ? "timing-collapse-item" : workStatus === '2' ?
'warning-collapse-item' : 'running-collapse-item'
return !(Object.keys(this.CLUSTERWorkStatusOptions).includes(item.workStatus)) ? "timing-collapse-item" :
workStatus === '9' ? 'warning-collapse-item' : 'running-collapse-item'
},
},
onLoad(options) {

View File

@ -1,10 +1,13 @@
const ems = {
state: {
workStatusOptions: {
'0': '运行',
'1': '停机',
'2': '故障'
}, //工作状态
CLUSTERWorkStatusOptions: {
'0': '静置',
'1': '充电',
'2': '放电',
'3': '待机',
'5': '运行',
'9': "故障"
}, //电池簇工作状态
PCSWorkStatusOptions: {
'0': '运行',
'1': '停机',
@ -14,10 +17,12 @@ const ems = {
'5': '放电'
}, //PCS工作状态
STACKWorkStatusOptions: {
"0": "置",
"0": "置",
"1": "充电",
"2": "放电",
"3": "浮充",
'4': '待机',
'5': '运行',
'9': "故障"
}, //STACKBMS总览工作状态
deviceStatusOptions: {