Merge branch 'master' of git.sagacloud.cn:web/ibms

src/components/business_space/business/handsontable.vue

@@ -259,9 +259,15 @@ export default {
     getInfors(infos, row) {
       let val = this.hot.colToProp(row.col);
       if (val == "point") {
+        let query = {
+          RoomID: infos.RoomID,
+          zone: this.zoneCode,
+          isMyTab: 2,
+          buildFloorSelectd: this.buildFloorSelectd
+        }
         this.$router.push({
           path: "/ledger/spaceDetail",
-          query: { RoomID: infos.RoomID, zone: this.zoneCode, isMyTab: 2 }
+          query: query
         })
       } else if (val == "RoomQRCode") {
         this.qrcodeUrl = this.main[row.row].RoomQRCode

src/components/business_space/newGraphy/graphy.vue

@@ -495,9 +495,15 @@ export default {
     // 编辑空间详情
     editeSpaceDetail() {
       let item = this.curZoneItem.data;
+      let query = {
+        RoomID: item.RoomID,
+        zone: this.tab.code,
+        isMyTab: 1,
+        buildFloorSelectd: this.buildFloor
+      }
       this.$router.push({
         path: "/ledger/spaceDetail",
-        query: { RoomID: item.RoomID, zone: this.tab.code, isMyTab: 1 }
+        query: query
       })
     },
     // 重新划分业务空间

src/views/ledger/spacelist/index.vue

@@ -12,10 +12,8 @@
     <!--------- 页面头部   -------------->
     <div class="saga-title">
       <div class="saga-build-mess">
-        <!-- <span style="padding-right:12px;color:#999999;">建筑楼层</span> -->
-        <floorCascader @change="changeCascader"></floorCascader>
+        <floorCascader @change="changeCascader" ref="floorCascader"></floorCascader>
         <input type="hidden" v-model="zoneItemID">
-        <!-- <el-cascader :options="options" v-model="buildFloorSelectd" :props="props" @change="changeCascader"></el-cascader> -->
       </div>
       <div class="saga-build-tab">
         <el-radio-group v-model="isMyTab" @change="changeRadio" style="width: 136px;">
@@ -154,7 +152,10 @@ export default {
           return t;
         })
         if (this.childBackParam.zone) {
-          this.changeCascader(this.buildFloorSelectd)
+          this.changeCascader(this.buildFloorSelectd);
+          this.$refs.floorCascader.setValue(this.buildFloorSelectd)
+        } else {
+          this.$refs.floorCascader.setValue([''])
         }
       })
     },
@@ -176,7 +177,7 @@ export default {
         }).filter(item => item);
         if (this.childBackParam.zone) {
           this.activeName = this.childBackParam.zone;
-          // this.buildFloorSelectd = [this.childBackParam.BuildingId, this.childBackParam.FloorId];
+          this.buildFloorSelectd = this.childBackParam.buildFloorSelectd;
           this.isMyTab = this.childBackParam.isMyTab;
         } else {
           this.activeName = 'GeneralZone';

src/views/ledger/spacelist/spaceDetail/index.vue

@@ -83,8 +83,6 @@ export default {
       }
       queryZone(pa, res => {
         this.spaceDetails = res.Content[0];
-        // this.params.BuildingId = this.spaceDetails.BuildingId;
-        // this.params.FloorId = this.spaceDetails.FloorId;
       })
     },
     // 设置iframe
@@ -172,4 +170,3 @@ export default {
   color: #000;
 }
 </style>
-