浏览代码

Merge branch 'screen' into dev

haojianlong 5 年之前
父节点
当前提交
f594a51a1c

+ 6 - 3
src/components/business_space/newTables/eqToSpaceTable.vue

@@ -7,7 +7,7 @@
       </el-tooltip>
     </el-row>
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="100%" :header-cell-style="headerStyle"  v-loading="loading">
+      <el-table :data="tableData" style="width: 100%" height="100%" :header-cell-style="headerStyle" v-loading="loading">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
@@ -158,13 +158,16 @@ export default {
       this.$refs.addEqDialog.floor = this.params.buildFloorSelectd;
       this.$refs.addEqDialog.showDialog()
     },
-    changeContentStyle(){
-      this.$route.name == "spaceLedger"?this.hidden = false:this.hidden = true;
+    changeContentStyle() {
+      this.$route.name == "spaceLedger" ? this.hidden = false : this.hidden = true;
     }
   },
   watch: {
     type() {
       this.getTableData()
+    },
+    params() {
+      this.getTableData()
     }
   }
 };

+ 3 - 0
src/components/business_space/newTables/syInSpaceTable.vue

@@ -129,6 +129,9 @@ export default {
   watch: {
     type() {
       this.getTableData()
+    },
+    params() {
+      this.getTableData()
     }
   }
 };

+ 1 - 2
src/views/screen/splitscreen/spaceledger/index.vue

@@ -282,7 +282,7 @@ export default {
             tools.setDataForKey(
               this.spaceDetails,
               this.tableData[index].Path,
-              this.tableData[index].functionNoDynamicData = item.error ? item.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
+              this.$set(this.tableData[index], "functionNoDynamicData", item.error ? item.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据")
             );
           })
         });
@@ -294,7 +294,6 @@ export default {
     "$route"(to, from) {
       if (this.$route.name === "spaceLedger" && this.$route.query.RoomID && this.$route.query.zone) {
         this.getData();
-        this.activeTab = 'staticData';
       }
     }
   }