From 16206cd0030eed0f9aed1dc9b8f24f3b8ea62d7c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 28 Dec 2020 15:01:25 +0800 Subject: [PATCH] =?UTF-8?q?bug:=201=20&=20=E7=B4=A7=E6=80=A5=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E8=B0=83=E6=95=B4=20&=20bug:=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shape/StationStand/emergent/EEmergentCross.js | 12 ++++++------ .../shape/StationStand/safeStand/EHollowStand.js | 2 +- .../shape/StationStand/safeStand/ESolidStand.js | 2 +- .../theme/fuzhou_01/menus/dialog/standStopTime.vue | 2 +- src/utils/loaddata.js | 2 +- .../planMonitor/editTool/menus/createEmptyPlan.vue | 2 +- .../newEditTool/menus/createEmptyPlan.vue | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js b/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js index 9060d3733..afd57c29d 100644 --- a/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js +++ b/src/jmapNew/shape/StationStand/emergent/EEmergentCross.js @@ -14,13 +14,13 @@ class EEmergentCross extends Group { const model = this.model.modelData; const style = this.model.style; - const emergentOffset = model.inside ? style.StationStand.emergentCross.insideOffset : style.StationStand.emergentCross.outsideOffset; + const emergentOffset = model.inside ? style.StationStand.emergentRhombus.insideOffset : style.StationStand.emergentRhombus.outsideOffset; const emergentH = model.right ? 1 : -1; const emergentX = model.position.x + emergentH * emergentOffset.x; const emergentY = model.position.y + emergentH * emergentOffset.y; - model.r = style.StationStand.emergentCross.mergentR; - model.n = style.StationStand.emergentCross.mergentN; + model.r = style.StationStand.emergentRhombus.mergentR; + model.n = style.StationStand.emergentRhombus.mergentN; this.emergent = new Isogon({ zlevel: this.model.zlevel, @@ -33,7 +33,7 @@ class EEmergentCross extends Group { }, style: { lineWidth: 2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.add(this.emergent); @@ -52,7 +52,7 @@ class EEmergentCross extends Group { }, style:{ lineWidth:2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.emergentLine2 = new Line({ @@ -66,7 +66,7 @@ class EEmergentCross extends Group { }, style:{ lineWidth:2, - stroke:style.StationStand.emergentCross.defaultColor + stroke:style.StationStand.emergentRhombus.defaultColor } }); this.add(this.emergentLine1); diff --git a/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js b/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js index 6132f8af1..c59733a18 100644 --- a/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/EHollowStand.js @@ -49,7 +49,7 @@ class EHollowStand extends Group { // 停车 model.trainParking && this.setColor(style.StationStand.hollowStand.doorOpenColor); // 紧急停车 - model.emergencyClosed && this.setColor(this.style.StationStand.hollowStand.spareColor); + model.emergencyClosed && this.setColor(style.StationStand.hollowStand.spareColor); } } diff --git a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js index 3c9b45fdf..221096554 100644 --- a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js @@ -84,7 +84,7 @@ class ESolidStand extends Group { model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); model.trainParking && this.setStroke(style.StationStand.solidStand.doorOpenColor); // 紧急停车 - model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor); + model.emergencyClosed && this.setColor(style.StationStand.solidStand.spareColor); } else { this.handlePassagerColor(model.num); } diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue index 372879040..2c605c30b 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue @@ -230,7 +230,7 @@ export default { parkingTime: this.control === '01' ? -1 : this.time, parkingAlwaysValid: this.control === '01' ? true : this.effective }, - messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`] + messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == true ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`] }; this.loading = true; diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js index 3a2ce1772..6986c3420 100644 --- a/src/utils/loaddata.js +++ b/src/utils/loaddata.js @@ -58,7 +58,7 @@ export function handleMapData(mapData, type) { } } export function loadRunPlanData(group, dataError) { - if (!store.state.runPlan.runPlanInfo) { + if (!store.state.runPlan.runPlanInfo || !store.state.runPlan.runPlanInfo.templateId) { MessageBox.confirm('未获取到运行图信息！', '提示', { confirmButtonText: '确定', showCancelButton: false, diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue index 0fbb2122a..ec3b60631 100644 --- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue @@ -129,7 +129,7 @@ export default { } }, doShow() { - this.newModel.map = this.$route.params.mapId || this.$route.query.mapId; + this.newModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.dialogShow = true; this.initLoad(); diff --git a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue index 4c27f9218..169275855 100644 --- a/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue +++ b/src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue @@ -129,7 +129,7 @@ export default { } }, doShow() { - this.newModel.map = this.$route.params.mapId || this.$route.query.mapId; + this.newModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId; this.dialogShow = true; this.initLoad();