|
|
@@ -246,18 +246,24 @@ export default {
|
|
|
if (this.bgMove) {
|
|
|
return
|
|
|
}
|
|
|
- if (this.canAdd(this.mapInfo[index])) {
|
|
|
+ if (this.canAdd(this.mapInfo[index])&&!this.isAreaShowPoint) {
|
|
|
this.$emit('choosePoint', {
|
|
|
x: this.getX(index),
|
|
|
y: this.getY(index),
|
|
|
index: index
|
|
|
})
|
|
|
}
|
|
|
+ else if(!this.canAdd(this.mapInfo[index])&&this.isAreaShowPoint){
|
|
|
+ this.$emit('choosePoint', {
|
|
|
+ x: this.getX(index),
|
|
|
+ y: this.getY(index),
|
|
|
+ index: index
|
|
|
+ })
|
|
|
+ }
|
|
|
else {
|
|
|
- this.$alert('只能在区域内添加', '提示', {
|
|
|
+ this.$alert('只能在区域'+(this.isAreaShowPoint?'外':'内')+'添加', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
callback: action => {
|
|
|
-
|
|
|
}
|
|
|
});
|
|
|
}
|