Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-swp

src/views/drawCanvas/riskView.vue

@@ -636,7 +636,7 @@ export default {
         y: this.layout.length + (this.colNum / 2 || 12),
         w: 2,
         h: 3,
-        i: i,
+        i:this.copyRoom.isCopy ? this.copyRoom.id : i,
         id: this.copyRoom.isCopy ? this.copyRoom.id : i,
         name: this.roomName,
         c: "#e6e5e5",
@@ -660,6 +660,10 @@ export default {
           ? "基础设施"
           : "9999",
       };
+      if(this.copyRoom.isCopy){
+        data.id = this.copyRoom.id 
+      }
+    
       this.layoutData.push(data);
       this.resetCopy();
       // postFun("/ledger/room/save", data)