Merge branch 'develop' into single-develop

src/views/ems/dzjk/sbjk/pcs/index.vue

@@ -9,8 +9,8 @@
     >
       <el-card
           :class="{
-          'warning-card-container': pcsItem.workStatus === '1',
-          'timing-card-container': pcsItem.workStatus === '2',
+          'warning-card-container': pcsItem.workStatus === '2',
+          'timing-card-container': pcsItem.workStatus === '1',
           'running-card-container': !['1', '2'].includes(pcsItem.workStatus),
         }"
           class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
@@ -75,7 +75,7 @@
             >
             <el-descriptions-item
                 :contentClassName="`descriptions-direction ${
-                pcsItem.deviceStatus === '2' ? 'save' : 'danger'
+                pcsItem.deviceStatus === '1' ? 'save' : 'danger'
               }`"
                 :span="1"
                 label="设备状态"

src/views/ems/dzjk/zxlt/index.vue

@@ -34,7 +34,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -68,7 +68,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -107,7 +107,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -150,7 +150,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -171,7 +171,7 @@
                   <div
                       class="status"
                       :class="
-                      item.children[0].deviceStatus === '2'
+                      item.children[0].deviceStatus === '1'
                         ? 'status-running'
                         : ''
                     "

src/views/ems/site/sblb/PcsSwitch.vue

@@ -32,7 +32,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          deviceStatus: null,
+          workStatus: null,
           deviceId: null,
           deviceName: null,
         }
@@ -42,13 +42,13 @@ export default {
   },
   computed: {
     label() {
-      return this.data.deviceStatus === '4' ? '开机' : '关机'
+      return this.data.workStatus === '0' ? '关机' : '开机'
     }
   },
   methods: {
     switchStatus() {
       console.log(this.data, 11111111)
-      const {deviceStatus, deviceId, deviceName, siteId} = this.data
+      const {workStatus, deviceId, deviceName, siteId} = this.data
       this.$confirm(`确认要${this.label}设备${deviceName || ''}吗?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -61,7 +61,7 @@ export default {
             //做开关机操作,更新成功后刷新表格
             updateDeviceStatus({
               siteId,
-              deviceStatus,
+              workStatus: workStatus === '0' ? "1" : '0',
               deviceId
             })
                 .then((response) => {