页面调整

src/pages/eq/hall/config.js

@@ -11,7 +11,7 @@
     },
     {
       align: 'center',
-      prop: 'status',
+      prop: 'statusName',
       label: '设备状态'
     },
     {
@@ -99,19 +99,19 @@
     },
     {
       align: 'center',
-      prop: 'status',
+      prop: 'statusName',
       label: '设备状态'
     },
     {
       align: 'center',
       prop: 'electric_energy',
-      label: '今日用电量'
-    },
-    {
-      align: 'center',
-      prop: 'F',
-      label: '本月用电量'
+      label: '用电量'
     },
+    // {
+    //   align: 'center',
+    //   prop: 'F',
+    //   label: '本月用电量'
+    // },
     {
       align: 'center',
       prop: 'code',
@@ -137,7 +137,7 @@
     },
     {
       align: 'center',
-      prop: 'status',
+      prop: 'statusName',
       label: '设备状态'
     },
     {

src/pages/eq/office/config.js

@@ -11,19 +11,19 @@
     },
     {
       align: 'center',
-      prop: 'status',
+      prop: 'statusName',
       label: '设备状态'
     },
     {
       align: 'center',
       prop: 'electric_energy',
-      label: '今日用电量'
-    },
-    {
-      align: 'center',
-      prop: 'E',
-      label: '本月用电量'
+      label: '用电量'
     },
+    // {
+    //   align: 'center',
+    //   prop: 'E',
+    //   label: '本月用电量'
+    // },
     {
       align: 'center',
       prop: 'code',
@@ -59,7 +59,7 @@
     },
     {
       align: 'center',
-      prop: 'status',
+      prop: 'statusName',
       label: '设备状态'
     },
     {

src/pages/kb/indoor/index.vue

@@ -90,7 +90,7 @@ card-warp(title="室内气象数据", height="45px", showBackground)
           span ( PPM )
       el-table-column(
         :resizable="false",
-        prop="status",
+        prop="statusName",
         header-align="center",
         align="center",
         label="设备状态"

src/pages/kb/outdoor/index.vue

@@ -105,7 +105,7 @@ card-warp(title="室外气象数据", height="45px", showBackground)
       )
       el-table-column(
         :resizable="false",
-        prop="status",
+        prop="statusName",
         header-align="center",
         align="center",
         label="设备状态"
@@ -231,15 +231,23 @@ export default {
       this.typeList[7].num = this.socketData.radiation
       this.typeList[8].num = this.socketData.region
       //列表
-       for (var i = 0; i < this.dataList.length; i++) {
-          this.$set(this.dataList[i], 'temperature', this.socketData.temperature)
-          this.$set(this.dataList[i], 'humidity', this.socketData.humidity)
-          this.$set(this.dataList[i], 'wind_speed', this.socketData.wind_speed)
-          this.$set(this.dataList[i], 'Illuminance', this.socketData.Illuminance)
-          this.$set(this.dataList[i], 'carbon_dioxide', this.socketData.carbon_dioxide)
-          this.$set(this.dataList[i], 'fine_particles', this.socketData.fine_particles)
-          this.$set(this.dataList[i], 'radiation', this.socketData.radiation)
-       }
+      for (var i = 0; i < this.dataList.length; i++) {
+        this.$set(this.dataList[i], 'temperature', this.socketData.temperature)
+        this.$set(this.dataList[i], 'humidity', this.socketData.humidity)
+        this.$set(this.dataList[i], 'wind_speed', this.socketData.wind_speed)
+        this.$set(this.dataList[i], 'Illuminance', this.socketData.Illuminance)
+        this.$set(
+          this.dataList[i],
+          'carbon_dioxide',
+          this.socketData.carbon_dioxide
+        )
+        this.$set(
+          this.dataList[i],
+          'fine_particles',
+          this.socketData.fine_particles
+        )
+        this.$set(this.dataList[i], 'radiation', this.socketData.radiation)
+      }
     },
     csHandle() {
       this.$http({

src/pages/kb/power/config.js

@@ -17,15 +17,15 @@ export const tableColums = [
     label: '当日用电量',
     width: 162
   },
+  // {
+  //   align: 'center',
+  //   prop: 'D',
+  //   label: '当月用电量',
+  //   width: 162
+  // },
   {
     align: 'center',
-    prop: 'D',
-    label: '当月用电量',
-    width: 162
-  },
-  {
-    align: 'center',
-    prop: 'status',
+    prop: 'statusName',
     label: '设备状态',
     width: 152
   },