Merge

src/pages/eq/hall/components/hallModal.vue

 <template>
-  <el-dialog title="编辑" :visible.sync="hallModalVisible" :append-to-body="true">
-    <el-form >
+  <el-dialog
+    title="设定频率"
+    :visible.sync="hallModalVisible"
+    :append-to-body="true"
+  >
+    <el-form>
       <el-form-item label="设定频率：" :label-width="formLabelWidth">
         <el-input size="mini" autocomplete="off"></el-input>
       </el-form-item>
-      <el-form-item label="启动控制：" :label-width="formLabelWidth">
-             <el-switch ></el-switch>
-      </el-form-item>
+      <!-- <el-form-item label="启动控制：" :label-width="formLabelWidth">
+        <el-switch></el-switch>
+      </el-form-item> -->
     </el-form>
-    <div slot="footer" >
+    <div slot="footer">
       <el-button @click="cancelhandle">取 消</el-button>
       <el-button type="primary" @click="cancelhandle">确 定</el-button>
     </div>
   </el-dialog>
-  
 </template>
 <script lang="ts">
 export default {
-  name: "hallModal",
-  props: ["hallModalVisible"],
+  name: 'hallModal',
+  props: ['hallModalVisible'],
   data() {
     return {
-        formLabelWidth:'120px',
-    };
+      formLabelWidth: '120px'
+    }
   },
-  methods:{
-    cancelhandle(){
+  methods: {
+    cancelhandle() {
       this.$emit('cancelhandle')
     }
   }
-};
+}
 </script>

src/pages/eq/hall/page.vue

@@ -50,10 +50,12 @@
           </div>
         </div>
         <!-- table  -->
-        <enTable v-on:handleBtnClick="handleBtnClick" :tableData="tableData" :tableColums="tableColums" :isShowOp="true" isShowPage="true">
+        <enTable :tableData="tableData" :tableColums="tableColums" :isShowOp="true" isShowPage="true">
           <template v-slot:operation='scope'>
-            <el-button type="text" @click="hallModalVisible=true">编辑</el-button>
-
+            <el-button type="text" @click="statusHandle" >开启</el-button>
+            <el-button type="text" @click="statusHandle">关闭</el-button>
+            <el-button type="text" @click="statusHandle" v-if="activeTab=='01'">故障复位</el-button>
+            <el-button type="text" @click="handleBtnClick" v-if="activeTab!='01'">设置频率</el-button>
           </template>
         </enTable>
       </div>
@@ -69,9 +71,9 @@ import hallModal from './components/hallModal'
 import {
   tableDataOne,
   tableColumsOne,
+  tableColumsTwo,
   tableDataTwo,
-  tableDataThree,
-  tableDataFour
+  tableDataThree
 } from './config'
 
 export default {
@@ -89,17 +91,13 @@ export default {
           this.tableData = tableDataOne
           break
         case '02':
-          this.tableColums = tableColumsOne
+          this.tableColums = tableColumsTwo
           this.tableData = tableDataTwo
           break
         case '03':
-          this.tableColums = tableColumsOne
+          this.tableColums = tableColumsTwo
           this.tableData = tableDataThree
           break
-        case '04':
-          this.tableColums = tableColumsOne
-          this.tableData = tableDataFour
-          break
       }
     }
   },
@@ -112,18 +110,14 @@ export default {
       tabList: [
         {
           value: '01',
-          label: '热泵'
-        },
-        {
-          value: '02',
           label: '风冷热泵机组'
         },
         {
-          value: '03',
+          value: '02',
           label: '室内机风柜'
         },
         {
-          value: '04',
+          value: '03',
           label: ' 水泵'
         }
       ],
@@ -138,6 +132,9 @@ export default {
     },
     handleBtnClick() {
       this.hallModalVisible = true
+    },
+    statusHandle() {
+
     }
   }
 }

src/pages/eq/office/page.vue

 <template>
   <div class="office-area-control" style="height:100%;">
     <cardList cardListTitle="办公区域控制">
-      <div slot="content" >
+      <div slot="content">
         <!-- <enTabs :tabList="officeTabList"></enTabs> -->
-         <el-tabs class="en-tabs" v-model="activeTab" >
+        <el-tabs class="en-tabs" v-model="activeTab">
           <el-tab-pane
             :label="item.label"
             :name="item.value"
@@ -12,165 +12,35 @@
           ></el-tab-pane>
         </el-tabs>
         <div style="margin-top: 20px"></div>
-        <en-table :tableData="tableData" :tableColums="tableColums" :isShowOp="true" isShowPage="true">
-          <template v-slot:operation='scope'>
-           <el-button type="text">编辑</el-button>
+        <en-table
+          :tableData="tableData"
+          :tableColums="tableColums"
+          :isShowOp="true"
+          isShowPage="true"
+        >
+          <template v-slot:operation="scope">
+            <el-button type="text" @click="statusHandle">开启</el-button>
+            <el-button type="text" @click="statusHandle">关闭</el-button>
           </template>
         </en-table>
       </div>
     </cardList>
   </div>
 </template>
-<script >
-// const tableColums = [
-//   {
-//     align: "center",
-//     prop: "A",
-//     label: "设备名称",
-//     width: 132,
-//   },
-//   {
-//     align: "center",
-//     prop: "B",
-//     label: "设备位置",
-//     // width: 112,
-//   },
-//   {
-//     align: "center",
-//     prop: "C",
-//     label: "控制方式",
-//     width: 132,
-//   },
-//   {
-//     align: "center",
-//     prop: "D",
-//     label: "能耗统计",
-//     width: 132,
-//   },
-//   // {
-//   //   align: "center",
-//   //   prop: "E",
-//   //   label: "故障报警",
-//   //   width: 132,
-//   // },
-//   // {
-//   //   align: "center",
-//   //   prop: "F",
-//   //   label: "说明",
-//   //   width: 132,
-//   // },
-//   {
-//     align: "center",
-//     prop: "G",
-//     label: "设备编号",
-//     width: 132,
-//   },
-// ];
-// const tableData = [
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-//   {
-//     A: "A",
-//     B: "YA01254N51",
-//     C: "正常",
-//     D: "110Hz",
-//     E: "",
-//     F: "说明",
-//     G: "QY0001",
-//   },
-// ];
+<script>
 import cardList from '../../components/cardList'
 import enTabs from '../../components/enTabs'
 import enTable from '../../components/enTable'
-import { tableDataOne, tableColumsOne, tableDataTwo, tableDataThree, tableDataFour } from './config'
+import {
+  tableColumsOne,
+  tableDataOne,
+  tableDataTwo,
+  tableDataThree,
+  tableDataFour,
+  tableDataFive,
+  tableDataSix,
+  tableDataSeven
+} from './config'
 
 export default {
   name: 'officeAreaControl',
@@ -188,19 +58,31 @@ export default {
       officeTabList: [
         {
           value: '01',
-          label: '多联空调'
+          label: '排风机'
         },
         {
           value: '02',
-          label: '多联新风'
+          label: '机房空调(220V)'
         },
         {
           value: '03',
-          label: '机房空调'
+          label: '机房空调(380V)'
         },
         {
           value: '04',
-          label: '排风机'
+          label: '风幕机'
+        },
+        {
+          value: '05',
+          label: '多联室内机'
+        },
+        {
+          value: '06',
+          label: '多联室外机'
+        },
+        {
+          value: '07',
+          label: '换气扇'
         }
       ]
     }
@@ -224,8 +106,23 @@ export default {
           this.tableColums = tableColumsOne
           this.tableData = tableDataFour
           break
+        case '05':
+          this.tableColums = tableColumsOne
+          this.tableData = tableDataFive
+          break
+        case '06':
+          this.tableColums = tableColumsOne
+          this.tableData = tableDataSix
+          break
+        case '07':
+          this.tableColums = tableColumsOne
+          this.tableData = tableDataSeven
+          break
       }
     }
+  },
+  methods: {
+    statusHandle() {}
   }
 }
 </script>