页面调整

src/pages/eq/office/config.js

@@ -68,3 +68,26 @@
       label: '设备编号'
     }
   ]
+
+  export const tableColumsThree = [
+    {
+      align: 'center',
+      prop: 'name',
+      label: '设备名称'
+    },
+    {
+      align: 'center',
+      prop: 'deployLocation',
+      label: '设备位置'
+    },
+    {
+      align: 'center',
+      prop: 'statusName',
+      label: '设备状态'
+    },
+    {
+      align: 'center',
+      prop: 'code',
+      label: '设备编号'
+    }
+  ]

src/pages/eq/office/page.vue

@@ -64,7 +64,7 @@
 import cardList from '../../components/cardList'
 import enTabs from '../../components/enTabs'
 import enTable from '../../components/enTable'
-import { tableColumsOne, tableColumsTwo } from './config'
+import { tableColumsOne, tableColumsTwo, tableColumsThree } from './config'
 import tablePagination from '@/pages/components/tablePagination'
 export default {
   name: 'officeAreaControl',
@@ -98,7 +98,7 @@ export default {
         },
         {
           id: 'c788ce98c1f248f590434394da485ce4',
-          label: '防火卷帘门'
+          label: '电动卷帘门'
         },
         {
           id: '173466a2cf9a42a6a17b2bdfbeae36d5',
@@ -110,7 +110,11 @@ export default {
         },
         {
           id: '49f5921a6d7f43cfa222c09f0223ae04',
-          label: '换气扇'
+          label: '电动排烟窗'
+        },
+        {
+          id: '8f0787103561423887324f8ac3c36b89',
+          label: '多联新风处理机室内机'
         }
       ]
     }
@@ -130,6 +134,9 @@ export default {
     },
     dlsnjList() {
       return this.$store.state.d2admin.paramsList.list.dlsnjList
+    },
+    dlxfsnjList() {
+      return this.$store.state.d2admin.paramsList.list.dlxfsnjList
     }
   },
   watch: {
@@ -147,7 +154,7 @@ export default {
           this.tableColums = tableColumsOne
           break
         case 'c788ce98c1f248f590434394da485ce4':
-          this.tableColums = tableColumsOne
+          this.tableColums = tableColumsThree
           break
         case '173466a2cf9a42a6a17b2bdfbeae36d5':
           this.tableColums = tableColumsTwo
@@ -156,7 +163,10 @@ export default {
           this.tableColums = tableColumsOne
           break
         case '49f5921a6d7f43cfa222c09f0223ae04':
-          this.tableColums = tableColumsOne
+          this.tableColums = tableColumsThree
+          break
+        case '8f0787103561423887324f8ac3c36b89':
+          this.tableColums = tableColumsTwo
           break
       }
     }
@@ -195,11 +205,7 @@ export default {
           //排风机
           this.pfjList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -208,11 +214,7 @@ export default {
           //机房空调(220V)
           this.jfktpList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -221,39 +223,50 @@ export default {
           //机房空调(380V)
           this.jfktgList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
           this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
         ) {
-          //防火卷帘门
+          //自动卷帘门
         } else if (
           this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04'
         ) {
-          //换气扇
+          //电动排烟窗
         } else if (
           this.tableData[i].type === '8f5530fee2484e8eb107c0ca672132b2'
         ) {
           //多联室外机
           this.dlswjList.forEach((e) => {
+            if (this.tableData[i].id === e.resource_id) {
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
+            }
+          })
+        } else if (
+          this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5'
+        ) {
+          //多联室内机
+          this.dlsnjList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
               this.$set(
                 this.tableData[i],
-                'electric_energy',
-                e.electric_energy
+                'setting_temperature',
+                e.setting_temperature
+              )
+              this.$set(this.tableData[i], 'setting_mode', e.setting_mode)
+              this.$set(
+                this.tableData[i],
+                'setting_wind_speed',
+                e.setting_wind_speed
               )
             }
           })
         } else if (
-          this.tableData[i].type === '173466a2cf9a42a6a17b2bdfbeae36d5'
+          this.tableData[i].type === '8f0787103561423887324f8ac3c36b89'
         ) {
-          //多联室外机
-          this.dlsnjList.forEach((e) => {
+          //多联新风处理机室内机
+          this.dlxfsnjList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
               this.$set(
                 this.tableData[i],

src/pages/kb/power/page.vue

@@ -140,10 +140,6 @@ export default {
           value: 'b47661ca1d454f9792ba5369f3cb2bc5',
           label: '机房空调(380V)'
         },
-        {
-          value: 'c788ce98c1f248f590434394da485ce4',
-          label: '防火卷帘门'
-        },
         {
           value: 'b45827c068254695864ee3c1d42573cb',
           label: '风冷热泵机组'
@@ -233,11 +229,7 @@ export default {
           //排风机
           this.pfjList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -246,11 +238,7 @@ export default {
           //机房空调(220V)
           this.jfktpList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -259,28 +247,16 @@ export default {
           //机房空调(380V)
           this.jfktgList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
-        } else if (
-          this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
-        ) {
-          //防火卷帘门
         } else if (
           this.tableData[i].type === 'b45827c068254695864ee3c1d42573cb'
         ) {
           //风冷热泵机组
           this.flrbList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -289,11 +265,7 @@ export default {
           //室内机风柜
           this.sljfgList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -302,11 +274,7 @@ export default {
           //多联室外机
           this.dlswjList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         }