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

src/views/drawCanvas/riskView.vue

@@ -375,7 +375,7 @@ export default {
       // console.log('this.layout==>>',this.layout)
     },
     //关闭
-    close() {
+    async close() {
       this.layoutData.forEach(item => {
         if (
           typeof item.position == "object" &&
@@ -391,7 +391,9 @@ export default {
         })
         .then(() => {
           this.confim();
-          history.go(-1);
+          setTimeout(() => {
+            history.go(-1);
+          }, 500);
           // on confirm
         })
         .catch(() => {
@@ -425,7 +427,7 @@ export default {
           item.position = JSON.stringify(item.position);
         }
       });
-      console.log("data==>>", data);
+      console.log("this.$route.params.floorId==>>", this.$route.params.floorId);
       postFun(
         "/ledger/room/update/batch?floorId=" + this.$route.params.floorId,
         data