From a578436d7f0040e0af24add5837cc9cc992766c1 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 08 三月 2024 08:49:09 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

---
 src/container/Map/Map.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/container/Map/Map.vue b/src/container/Map/Map.vue
index 28e70f6..fd0e080 100644
--- a/src/container/Map/Map.vue
+++ b/src/container/Map/Map.vue
@@ -427,23 +427,28 @@
         },
         sign(type) {
 			//if(type == 2){//2:璁惧
-				console.log('hh',this);
+				//console.log('hh',this);
 				const { x, x1, y, y1 } = this.range
 				
 				for (var i = x; i <= x1; i++) {
 					for (var j = y; j <= y1; j++) {
+						
 						let arr = [...(this.map[i])]
 						if (type == 2 && (arr[j].colspan < 4 || arr[j].rowspan  <  4)) { //x1-x<3 || y1-y<3
+							
 							return this.$message({
 								type: 'error',
 								message: '鍗曞厓鏍艰緝灏忥紝鏃犳硶灞曠ず璁惧锛岃鑷冲皯鍚堝苟4琛�4鍒楀崟鍏冩牸'
 							})
+							
 						}
 						
 						arr[j].type = type
 						arr[j].id = undefined
 						this.$set(this.map, i, arr)
+						
 					}
+					
 				}
 			//}
             this.showAction = false

--
Gitblit v1.9.3