diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index 2ca7e4804..007fea5ca 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -97,23 +97,23 @@ class MouseController extends Eventful { } mousemove(e) { - if (this._dragging) { - const oldX = this._x; - const oldY = this._y; + if (this._dragging) { + const oldX = this._x; + const oldY = this._y; - const dx = e.offsetX - oldX; - const dy = e.offsetY - oldY; + const dx = e.offsetX - oldX; + const dy = e.offsetY - oldY; - this._x = e.offsetX; - this._y = e.offsetY; + this._x = e.offsetX; + this._y = e.offsetY; - if (e.which == 1) { - this._preventDefaultMouseMove && eventTool.stop(e.event); - this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y }); - } else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) { - this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY}); - } - } + if (e.which == 1) { + this._preventDefaultMouseMove && eventTool.stop(e.event); + this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y }); + } else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) { + this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY}); + } + } } mouseup(e) { diff --git a/src/views/newMap/newDesignUser/demonList.vue b/src/views/newMap/newDesignUser/demonList.vue index fe2232f8a..a094adb5d 100644 --- a/src/views/newMap/newDesignUser/demonList.vue +++ b/src/views/newMap/newDesignUser/demonList.vue @@ -109,7 +109,7 @@ export default { lineCode: elem.lineCode }, { - id: '1', + id: '2', name: '系统配置绘图', type: 'mapSystem', mapId: elem.id, diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue index 48f18b520..e35051b57 100644 --- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue +++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue @@ -294,6 +294,24 @@ + diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue index b64de62cd..1664d54cd 100644 --- a/src/views/newMap/newMapdraft/mapoperate/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/index.vue @@ -196,11 +196,19 @@ export default { } else if (controlLampTypeList.includes(type)) { this.enabledTab = 'ControlLamp'; } else { - this.enabledTab = type; + if (this.$refs['ZcControl'] && this.$refs['ZcControl'][0].field == 'checkZcSection') { + this.enabledTab = 'ZcControl'; + } else { + this.enabledTab = type; + } } }, deviceSelect(type) { + // if (this.$refs['ZcControl'].field != 'checkZcSection') { this.selectDevice = type; + // } else { + // this.selectDevice = 'ZcControl'; + // } }, saveMapEvent() { this.$emit('saveMapEvent'); diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue index 0bf3f5b50..d21549558 100644 --- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue +++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue @@ -1,5 +1,5 @@