枚举更新

config.js

@@ -2,9 +2,9 @@
 module.exports = {
 	// todo 打包项目时切换baseUrl
 	// 测试环境 
-	// baseUrl: 'http://110.40.171.179:8089',
+	baseUrl: 'http://110.40.171.179:8089',
 	// 生产环境
-	baseUrl: 'http://1.15.120.242:8089',
+	// baseUrl: 'http://1.15.120.242:8089',
 	// 应用信息
 	appInfo: {
 		// 应用名称

pages/work/dtdc/index.vue

@@ -99,7 +99,6 @@
 </template>
 
 <script>
-	// import Chart from './Chart.vue'
 	import DateRangeSelect from './../DateRangeSelect.vue'
 	import {
 		getStackNameList,
@@ -111,14 +110,6 @@
 		mapState
 	} from 'vuex'
 	export default {
-		computed: {
-			...mapState({
-				workStatusOptions: (state) =>
-					state.ems.workStatusOptions,
-				communicationStatusOptions: (state) =>
-					state.ems.communicationStatusOptions,
-			})
-		},
 		components: {
 			DateRangeSelect
 		},

pages/work/pcs/index.vue

@@ -12,7 +12,7 @@
 
 		<uni-collapse ref="collapse" accordion v-if="list.length > 0">
 			<uni-collapse-item v-for="(item,index) in list" :key="item.deviceId+'pcs'" :open="index===0"
-				:class="item.workStatus === '1' ? 'danger' : item.workStatus === '2' ? 'close' : 'running'">
+				:class="item.workStatus === '2' ? 'danger' : item.workStatus === '1' ? 'close' : 'running'">
 				<template v-slot:title>
 					<view class="title-row">
 						<view class="title">{{index+1}}#{{item.deviceName || ''}}</view>
@@ -42,7 +42,7 @@
 								<view class="grid-item-box">
 									<view class="title">设备状态</view>
 									<text class="text"
-										:class="item.deviceStatus === '2' ? 'status-running' : 'status-danger'">{{deviceStatusOptions[item.deviceStatus]}}</text>
+										:class="item.deviceStatus === '1' ? 'status-running' : 'status-danger'">{{deviceStatusOptions[item.deviceStatus]}}</text>
 								</view>
 							</uni-grid-item>
 							<uni-grid-item>

store/modules/ems.js

@@ -1,18 +1,14 @@
 const ems = {
 	state: {
 		workStatusOptions: {
-			'0': '正常',
+			'0': '运行',
-			'1': '异常',
+			'1': '停机',
-			'2': '停止'
+			'2': '故障'
 		}, //工作状态
 		deviceStatusOptions: {
 			'0': '离线',
-			'1': '待机',
+			'1': '在线'
-			'2': '运行',
-			'3': '故障',
-			'4': '停机'
 		}, //设备状态
-
 		gridStatusOptions: {
 			'0': '并网',
 			'1': '未并网'
@@ -65,7 +61,8 @@ const ems = {
 		}, //策略状态
 		chargeStatusOptions: {
 			'1': '充电',
-			'2': '待机'
+			'2': '待机',
+			'3': '放电'
 		}, //冲放状态
 	}
 }