提交

src/pages/eq/hall/page.vue

@@ -102,8 +102,7 @@
           </div>
         </div>
         <!-- table  -->
-        <!-- <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId : null'> -->
-        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId : 0'>
+        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentModel'>
           <template v-slot:operation="scope">
             <el-button
               type="text"
@@ -292,7 +291,6 @@ export default {
       tableColums: tableColumsOne,
       isSaving: 1, //节能
       isOpen: 2, //定时开关
-      currentModel: this.$store.state.d2admin.paramsList.list.syBean.currentModel,  //人工模式
       formData: {
         temperature: '',
         taskId: '',
@@ -337,6 +335,9 @@ export default {
     },
     sbList() {
       return this.$store.state.d2admin.paramsList.list.sbList
+    },
+    currentModel() {
+      return this.$store.state.d2admin.paramsList.list.syBean.currentModel
     }
   },
   watch: {
@@ -579,8 +580,6 @@ export default {
           this.currentId = id
         }
       })
-    console.log('currentModel'+this.currentModel);
-
     },
     statusHandle() {},
     // 人工节能

src/pages/eq/office/page.vue

@@ -54,7 +54,6 @@ export default {
     enTable,
     tablePagination,
     tableList,
-    
   },
 
   data() {
@@ -65,7 +64,6 @@ export default {
       activeTab: 'b6af764f2a6e454490a6b1b3c9057e57',
       tableData: [],
       tableColums: tableColumsOne,
-      currentModel: this.$store.state.d2admin.paramsList.list.syBean.currentModel,  //人工模式
       officeTabList: [
         {
           id: 'b6af764f2a6e454490a6b1b3c9057e57',
@@ -105,6 +103,9 @@ export default {
     },
     dlxfsnjList() {
       return this.$store.state.d2admin.paramsList.list.dlxfsnjList
+    },
+    currentModel() {
+      return this.$store.state.d2admin.paramsList.list.syBean.currentModel
     }
   },
   watch: {
@@ -132,7 +133,6 @@ export default {
   },
   mounted() {
     this.getDataList()
-    console.log(this.currentModel);
   },
   methods: {
     // 获取数据列表