From 8c3c7e0f75a0116ccad1e871459e4542fa7120e6 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 8 Dec 2021 13:18:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=BF=BB=E8=BD=AC=20?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/fuzhou_01.js | 1 + src/jmapNew/mouseController.js | 1 - src/jmapNew/shape/graph/Train/index.js | 4 ++-- src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index 46d1f568f..f6d345ea0 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -673,6 +673,7 @@ class SkinCode extends defaultStyle { {status: '07', showColor: '#FFFF00'} ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除 destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色 + runLineHide: true, // 运行时列车line 竖杆隐藏 directionType: [ { type: 1, diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index cc21941a4..d38195a0d 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -122,7 +122,6 @@ class MouseController extends Eventful { this._dragging = false; } if (this._zoomOnMouseWheel && this.$jmap.mapDevice['check_box'] && this._previewOrMapDraw ) { - console.log(this.isMoveRight, 'mouseup'); this.eventTarget = this.$jmap.mapDevice['check_box'].instance; this.handleBoundingRect(this.eventTarget); let em; diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 3e6fd7864..514065b16 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -232,9 +232,9 @@ export default class Train extends Group { let lineRShow = item.lineRShow; let arrowRShow = item.arrowRShow; if (flag) { - lineLShow = !item.lineLShow; + lineLShow = !item.lineLShow && !this.style.Train.trainStatusStyle.runLineHide; arrowLShow = !item.arrowLShow; - lineRShow = !item.lineRShow; + lineRShow = !item.lineRShow && !this.style.Train.trainStatusStyle.runLineHide; arrowRShow = !item.arrowRShow; } this.trainL && this.trainL.setLineShow(lineLShow); diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue index 305bfdfd6..f4256dcb7 100644 --- a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue +++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue @@ -107,8 +107,6 @@ export default { this.$root.$emit('dialogOpen', selected); this.selected = selected; // 如果不是断点激活,则需要对初始值进行初始化 - // if (!this.dialogShow) { - // } this.addModel.sectionCode = selected.code; this.dialogShow = true; this.$nextTick(function () { @@ -149,7 +147,6 @@ export default { const operate = { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose();