Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

gaosp

2024-03-08 a578436d7f0040e0af24add5837cc9cc992766c1

 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