页面调整

src/pages/analysis/energy/page.vue

@@ -113,11 +113,7 @@ export default {
         },
         {
           value: 'ece0b8b2db27411886254e81134988a3',
-          label: '机房空调(220V)'
-        },
-        {
-          value: 'b47661ca1d454f9792ba5369f3cb2bc5',
-          label: '机房空调(380V)'
+          label: '机房空调'
         },
         {
           value: 'b45827c068254695864ee3c1d42573cb',

src/pages/eq/hall/config.js

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

src/pages/eq/hall/page.vue

@@ -33,7 +33,7 @@
                     :key="item.id"
                     :class="[
                       item.id == currentId && active ? 'isActive' : '',
-                        item.icon,
+                      item.icon
                     ]"
                   >
                     <!-- <img :src="item.src" alt="" /> -->
@@ -66,7 +66,7 @@
                     :picker-options="{
                       start: '00:00',
                       step: '00:15',
-                      end: '24:00',
+                      end: '24:00'
                     }"
                   >
                   </el-time-select>
@@ -79,7 +79,7 @@
                       start: '00:00',
                       step: '00:15',
                       end: '24:00',
-                      minTime: formData.startTime,
+                      minTime: formData.startTime
                     }"
                   >
                   </el-time-select>
@@ -159,7 +159,12 @@ import enTabs from '../../components/enTabs'
 import hallModal from './components/hallModal'
 import tablePagination from '@/pages/components/tablePagination'
 
-import { tableColumsOne, tableColumsTwo, tableColumsThree } from './config'
+import {
+  tableColumsOne,
+  tableColumsTwo,
+  tableColumsThree,
+  tableColumsFour
+} from './config'
 
 export default {
   components: {
@@ -225,6 +230,14 @@ export default {
           value: '03',
           label: ' 水泵',
           id: 'f4c840711eae4bcb9536a890cdfda493'
+        },
+        {
+          id: 'c788ce98c1f248f590434394da485ce4',
+          label: '电动门帘'
+        },
+        {
+          id: '49f5921a6d7f43cfa222c09f0223ae04',
+          label: '电动排烟窗'
         }
       ],
       hallModalVisible: false
@@ -248,15 +261,18 @@ export default {
       switch (val) {
         case 'b45827c068254695864ee3c1d42573cb':
           this.tableColums = tableColumsOne
-          // this.tableData = tableDataOne
           break
         case '303310efddb34a2e9bf269bdff8a7dc5':
           this.tableColums = tableColumsTwo
-          // this.tableData = tableDataTwo
           break
         case 'f4c840711eae4bcb9536a890cdfda493':
           this.tableColums = tableColumsThree
-          // this.tableData = tableDataThree
+          break
+        case 'c788ce98c1f248f590434394da485ce4':
+          this.tableColums = tableColumsFour
+          break
+        case '49f5921a6d7f43cfa222c09f0223ae04':
+          this.tableColums = tableColumsFour
           break
       }
     }
@@ -343,11 +359,7 @@ export default {
                 'hot_air_stop_temperature',
                 e.hot_air_stop_temperature
               )
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -356,11 +368,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)
               this.$set(
                 this.tableData[i],
                 'current_frequency',
@@ -381,6 +389,14 @@ export default {
               )
             }
           })
+        } else if (
+          this.tableData[i].type === 'c788ce98c1f248f590434394da485ce4'
+        ) {
+          //电动门帘
+        } else if (
+          this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04'
+        ) {
+          //电动排烟窗
         }
       }
     },

src/pages/eq/office/config.js

@@ -68,26 +68,3 @@
       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, tableColumsThree } from './config'
+import { tableColumsOne, tableColumsTwo } from './config'
 import tablePagination from '@/pages/components/tablePagination'
 export default {
   name: 'officeAreaControl',
@@ -90,15 +90,7 @@ export default {
         },
         {
           id: 'ece0b8b2db27411886254e81134988a3',
-          label: '机房空调(220V)'
-        },
-        {
-          id: 'b47661ca1d454f9792ba5369f3cb2bc5',
-          label: '机房空调(380V)'
-        },
-        {
-          id: 'c788ce98c1f248f590434394da485ce4',
-          label: '电动卷帘门'
+          label: '机房空调'
         },
         {
           id: '173466a2cf9a42a6a17b2bdfbeae36d5',
@@ -108,10 +100,6 @@ export default {
           id: '8f5530fee2484e8eb107c0ca672132b2',
           label: '多联室外机'
         },
-        {
-          id: '49f5921a6d7f43cfa222c09f0223ae04',
-          label: '电动排烟窗'
-        },
         {
           id: '8f0787103561423887324f8ac3c36b89',
           label: '多联新风处理机室内机'
@@ -126,9 +114,6 @@ export default {
     jfktpList() {
       return this.$store.state.d2admin.paramsList.list.jfktpList
     },
-    jfktgList() {
-      return this.$store.state.d2admin.paramsList.list.jfktgList
-    },
     dlswjList() {
       return this.$store.state.d2admin.paramsList.list.dlswjList
     },
@@ -150,21 +135,12 @@ export default {
         case 'ece0b8b2db27411886254e81134988a3':
           this.tableColums = tableColumsOne
           break
-        case 'b47661ca1d454f9792ba5369f3cb2bc5':
-          this.tableColums = tableColumsOne
-          break
-        case 'c788ce98c1f248f590434394da485ce4':
-          this.tableColums = tableColumsThree
-          break
         case '173466a2cf9a42a6a17b2bdfbeae36d5':
           this.tableColums = tableColumsTwo
           break
         case '8f5530fee2484e8eb107c0ca672132b2':
           this.tableColums = tableColumsOne
           break
-        case '49f5921a6d7f43cfa222c09f0223ae04':
-          this.tableColums = tableColumsThree
-          break
         case '8f0787103561423887324f8ac3c36b89':
           this.tableColums = tableColumsTwo
           break
@@ -211,29 +187,12 @@ export default {
         } else if (
           this.tableData[i].type === 'ece0b8b2db27411886254e81134988a3'
         ) {
-          //机房空调(220V)
+          //机房空调
           this.jfktpList.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 === 'b47661ca1d454f9792ba5369f3cb2bc5'
-        ) {
-          //机房空调(380V)
-          this.jfktgList.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 === 'c788ce98c1f248f590434394da485ce4'
-        ) {
-          //自动卷帘门
-        } else if (
-          this.tableData[i].type === '49f5921a6d7f43cfa222c09f0223ae04'
-        ) {
-          //电动排烟窗
         } else if (
           this.tableData[i].type === '8f5530fee2484e8eb107c0ca672132b2'
         ) {

src/pages/home/page.vue

@@ -34,7 +34,7 @@
           <div class="f-item pull-left">
             <img src="./image/sun_icon.png" alt="" />
             <div class="card-desc">
-              <span>办公区域供暖模式</span>
+              <span>候车大厅供暖模式</span>
             </div>
             <div class="card-text">
               <p v-if="dataList.sun == 1" style="color: #4ecb74">开启</p>
@@ -44,7 +44,7 @@
           <div class="f-item pull-left">
             <img src="./image/fan_icon.png" alt="" />
             <div class="card-desc">
-              <span>办公区域机械通风模式</span>
+              <span>候车大厅机械通风模式</span>
             </div>
             <div class="card-text">
               <p v-if="dataList.fan == 1" style="color: #4ecb74">开启</p>
@@ -54,7 +54,7 @@
           <div class="f-item pull-left">
             <img src="./image/nan_fan_icon.png" alt="" />
             <div class="card-desc">
-              <span>办公区域自然通风模式</span>
+              <span>候车大厅自然通风模式</span>
             </div>
             <div class="card-text">
               <p v-if="dataList.nan == 1" style="color: #4ecb74">开启</p>

src/pages/kb/indoor/index.vue

@@ -5,7 +5,7 @@ card-warp(title="室内气象数据", height="45px", showBackground)
       el-button(size="mini", type="primary") 综合图形
   div(slot="content", style="height: 40%")
     el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
-      el-tab-pane(label="候车室区域", name="1")
+      el-tab-pane(label="候车区域", name="1")
       el-tab-pane(label="办公区域", name="2")
     el-form(:inline="true", :mode="formData")
       el-form-item(label="设备名称:", prop="name")
@@ -14,30 +14,36 @@ card-warp(title="室内气象数据", height="45px", showBackground)
         el-input(size="mini", v-model="formData.code", clearable)
       el-form-item
         el-button(type="primary", size="mini", @click="getDataList()") 查询
+        //- el-button(@click="csHandle" size="mini" icon="el-icon-search" type="primary") 发送消息
     .data-warp
       .data-item
-        .type 平均温度
+        .type(v-if="activeName == 1") 平均温度
+        .type(v-else) 温度
         .color-blue(v-if="hcdtSnqx")
           span.num(v-if="activeName == 1") {{ hcdtSnqx.temperature }}
-          span.num(v-else) {{ bgqySnqx.temperature }}
+          span.num(v-else) {{ currentRow.temperature?currentRow.temperature:'-- ' }}
           span.unit ℃
       .data-item
-        .type 平均湿度
+        .type(v-if="activeName == 1") 平均湿度
+        .type(v-else) 湿度
         .color-cyan(v-if="hcdtSnqx")
           span.num(v-if="activeName == 1") {{ hcdtSnqx.humidity }}
-          span.num(v-else) {{ bgqySnqx.humidity }}
+          span.num(v-else) {{ currentRow.humidity?currentRow.humidity:'-- ' }}
           span.unit %RH
       .data-item
-        .type 平均CO
+        .type(v-if="activeName == 1") 平均CO
+        .type(v-else) CO
           sub 2
         .color-green(v-if="hcdtSnqx")
           span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
-          span.num(v-else) {{ bgqySnqx.carbon_dioxide }}
+          span.num(v-else) {{ currentRow.carbon_dioxide?currentRow.carbon_dioxide:'-- ' }}
           span.unit PPM
     el-table(
       size="mini",
       :data="dataList",
       stripe,
+      highlight-current-row,
+      @current-change="handleCurrentChange",
       v-loading="dataListLoading",
       style="width: 100%",
       :header-cell-style="{ background: '#EEF8FF', color: '#333333' }"
@@ -50,6 +56,14 @@ card-warp(title="室内气象数据", height="45px", showBackground)
         width="50",
         label="序号"
       )
+      el-table-column(
+        :resizable="false",
+        prop="deployLocation",
+        header-align="center",
+        align="center",
+        width="240",
+        label="设备位置"
+      )
       el-table-column(
         :resizable="false",
         prop="code",
@@ -83,7 +97,7 @@ card-warp(title="室内气象数据", height="45px", showBackground)
       )
       el-table-column(
         :resizable="false",
-        prop="carbonDioxide",
+        prop="carbon_dioxide",
         header-align="center",
         align="center"
       )
@@ -141,6 +155,7 @@ export default {
     return {
       historyVisible: false,
       activeName: '1',
+      currentRow: {},
       formData: {},
       dataList: [],
       dataListLoading: false,
@@ -160,13 +175,41 @@ export default {
       return this.$store.state.d2admin.paramsList.list.snqxzList
     }
   },
-  watch: {},
+  watch: {
+    hcdtSnqx: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    bgqySnqx: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    snqxzList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    }
+  },
   mounted() {
     this.getDataList()
   },
   methods: {
     tabClick(tab, event) {
       this.formData = {}
+      if (this.activeName === '1') {
+        this.currentRow = {}
+      }
       this.getDataList()
     },
     // 获取数据列表
@@ -203,17 +246,34 @@ export default {
           if (this.snqxzList[i].resource_id === e.id) {
             this.$set(e, 'temperature', this.snqxzList[i].temperature)
             this.$set(e, 'humidity', this.snqxzList[i].humidity)
-            this.$set(e, 'carbonDioxide', this.snqxzList[i].carbon_dioxide)
+            this.$set(e, 'carbon_dioxide', this.snqxzList[i].carbon_dioxide)
           }
         })
       }
     },
+    csHandle() {
+      this.$http({
+        url: this.$http.adornUrl('/equipment/sendParamsInfo'),
+        method: 'post',
+        params: this.$http.adornParams({})
+      }).then((data) => {
+        if (data && data.code === 0) {
+        }
+      })
+    },
     showParams(data, type) {
       console.log(111)
       this.historyVisible = true
       this.$nextTick(() => {
         this.$refs.history.init(data, type)
       })
+    },
+    handleCurrentChange(val) {
+      if (this.activeName === '2') {
+        this.currentRow = val
+      }
+
+      console.log('currentRow：', this.currentRow)
     }
   }
 }
@@ -267,7 +327,7 @@ export default {
       font-size: 36px;
       font-family: PingFang SC;
       font-weight: 600;
-      color: #21acfc;
+      // color: #21acfc;
       padding-top: 12px;
     }
     .unit {

src/pages/kb/power/page.vue

@@ -134,11 +134,7 @@ export default {
         },
         {
           value: 'ece0b8b2db27411886254e81134988a3',
-          label: '机房空调(220V)'
-        },
-        {
-          value: 'b47661ca1d454f9792ba5369f3cb2bc5',
-          label: '机房空调(380V)'
+          label: '机房空调'
         },
         {
           value: 'b45827c068254695864ee3c1d42573cb',
@@ -162,9 +158,6 @@ export default {
     jfktpList() {
       return this.$store.state.d2admin.paramsList.list.jfktpList
     },
-    jfktgList() {
-      return this.$store.state.d2admin.paramsList.list.jfktgList
-    },
     flrbList() {
       return this.$store.state.d2admin.paramsList.list.flrbList
     },
@@ -178,6 +171,46 @@ export default {
   watch: {
     activeTab() {
       this.getDataList()
+    },
+    pfjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    jfktpList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    flrbList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    sljfgList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    dlswjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
     }
   },
   mounted() {
@@ -235,21 +268,12 @@ export default {
         } else if (
           this.tableData[i].type === 'ece0b8b2db27411886254e81134988a3'
         ) {
-          //机房空调(220V)
+          //机房空调
           this.jfktpList.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 === 'b47661ca1d454f9792ba5369f3cb2bc5'
-        ) {
-          //机房空调(380V)
-          this.jfktgList.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 === 'b45827c068254695864ee3c1d42573cb'
         ) {