tj

src/pages/components/tableList.vue

@@ -94,7 +94,7 @@ export default {
     // 不同状态颜色
     differentStateColor({ row, rowIndex }) {
       if (this.showStateColor == false) return
-      if (row.modeTypes === null || this.currentMode === null) {
+      if (row.modeTypes === null || this.currentMode === 0) {
         // 原有
         return ''
       } else if (row.modeTypes.includes(1) && this.currentMode == '1') {

src/pages/eq/hall/page.vue

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

src/pages/eq/office/page.vue

@@ -12,7 +12,13 @@
           ></el-tab-pane>
         </el-tabs>
         <div style="margin-top: 20px"></div>
-        <en-table
+        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentModel'>
+          <template v-slot:operation="scope">
+            <el-button type="text" @click="statusHandle">开启</el-button>
+            <el-button type="text" @click="statusHandle">关闭</el-button>
+          </template>
+        </table-list>
+        <!-- <en-table
           :tableData="tableData"
           :tableColums="tableColums"
           :isShowOp="true"
@@ -22,7 +28,7 @@
             <el-button type="text" @click="statusHandle">开启</el-button>
             <el-button type="text" @click="statusHandle">关闭</el-button>
           </template>
-        </en-table>
+        </en-table> -->
       </div>
     </cardList>
     <table-pagination
@@ -38,13 +44,17 @@ import enTabs from '../../components/enTabs'
 import enTable from '../../components/enTable'
 import { tableColumsOne, tableColumsTwo } from './config'
 import tablePagination from '@/pages/components/tablePagination'
+import tableList from '@/pages/components/tableList'
+
 export default {
   name: 'officeAreaControl',
   components: {
     cardList,
     enTabs,
     enTable,
-    tablePagination
+    tablePagination,
+    tableList,
+    
   },
 
   data() {
@@ -55,6 +65,7 @@ export default {
       activeTab: 'b6af764f2a6e454490a6b1b3c9057e57',
       tableData: [],
       tableColums: tableColumsOne,
+      currentModel: this.$store.state.d2admin.paramsList.list.syBean.currentModel,  //人工模式
       officeTabList: [
         {
           id: 'b6af764f2a6e454490a6b1b3c9057e57',
@@ -121,6 +132,7 @@ export default {
   },
   mounted() {
     this.getDataList()
+    console.log(this.currentModel);
   },
   methods: {
     // 获取数据列表

src/pages/eq/view/index.vue

@@ -386,6 +386,7 @@ export default {
         text: new Text({
           text: name, // 添加文字描述
           font: 'bold 14px font-size', // 设置字体大小
+          // padding: 'left',
           fill: new Fill({
             // 设置字体颜色
             color: 'black',