Merge branch 'msg-sever' of http://39.106.8.246:3003/web/ibms into msg-sever

src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -65,7 +65,6 @@ export default {
     //
     init(){
       this.getFloorData();
-      this.getOtherFloorOutLine();
     },
     // 初始化canvas
     initGraphy(Id, type) {
@@ -123,12 +122,13 @@ export default {
       }
       floorQuery(pa, res => {
         this.floorData = res.Content[0];
+        this.getOtherFloorOutLine();
         this.initGraphy(this.floorData.StructureInfo.FloorMap, 2)
       })
     },
     // 获取绑定该模型id的其他楼层轮廓线
     getOtherFloorOutLine() {
-      let modelid = this.$route.query.modelId;
+      let modelid = this.floorData.ModelId;
       let pa = {
         Filters: `ModelId='${modelid}'`
       }

src/views/ready/buildfloor/repetitionGraphy.vue

@@ -27,12 +27,12 @@ export default {
   },
   data() {
     return {
-      modelId: "", // 
+      // modelId: "", // 
       isEdit: false, // 是否编辑模式
     };
   },
   created() {
-    this.modelId = this.$route.query.modelId;
+    // this.modelId = this.$route.query.modelId;
     this.FloorID = this.$route.query.FloorID;
     this.BuildID = this.$route.query.BuildID;
   },
@@ -87,7 +87,8 @@ export default {
     },
     // 替换模型文件成功
     refresh(modelId) {
-      this.modelId = modelId
+      // this.modelId = modelId
+      this.$refs.drawFloor.init();
     }
   },
   watch: {