joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 1 & 紧急停车调整 & bug: 10

Browse Source
This commit is contained in:
fan 2020-12-28 15:01:25 +08:00
parent 614f835701
commit 16206cd003
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jmapNew/shape/StationStand/emergent/EEmergentCross.js
View File

@ -14,13 +14,13 @@ class EEmergentCross extends Group {
const model = this.model.modelData; const model = this.model.modelData;
const style = this.model.style; 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 emergentH = model.right ? 1 : -1;
const emergentX = model.position.x + emergentH * emergentOffset.x; const emergentX = model.position.x + emergentH * emergentOffset.x;
const emergentY = model.position.y + emergentH * emergentOffset.y; const emergentY = model.position.y + emergentH * emergentOffset.y;
model.r = style.StationStand.emergentCross.mergentR; model.r = style.StationStand.emergentRhombus.mergentR;
model.n = style.StationStand.emergentCross.mergentN; model.n = style.StationStand.emergentRhombus.mergentN;
this.emergent = new Isogon({ this.emergent = new Isogon({
zlevel: this.model.zlevel, zlevel: this.model.zlevel,
@ -33,7 +33,7 @@ class EEmergentCross extends Group {
}, },
style: { style: {
lineWidth: 2, lineWidth: 2,
stroke:style.StationStand.emergentCross.defaultColor stroke:style.StationStand.emergentRhombus.defaultColor
} }
}); });
this.add(this.emergent); this.add(this.emergent);
@ -52,7 +52,7 @@ class EEmergentCross extends Group {
}, },
style:{ style:{
lineWidth:2, lineWidth:2,
stroke:style.StationStand.emergentCross.defaultColor stroke:style.StationStand.emergentRhombus.defaultColor
} }
}); });
this.emergentLine2 = new Line({ this.emergentLine2 = new Line({
@ -66,7 +66,7 @@ class EEmergentCross extends Group {
}, },
style:{ style:{
lineWidth:2, lineWidth:2,
stroke:style.StationStand.emergentCross.defaultColor stroke:style.StationStand.emergentRhombus.defaultColor
} }
}); });
this.add(this.emergentLine1); this.add(this.emergentLine1);

2
src/jmapNew/shape/StationStand/safeStand/EHollowStand.js
View File

@ -49,7 +49,7 @@ class EHollowStand extends Group {
// 停车 // 停车
model.trainParking && this.setColor(style.StationStand.hollowStand.doorOpenColor); 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);
} }
} }

2
src/jmapNew/shape/StationStand/safeStand/ESolidStand.js
View File

@ -84,7 +84,7 @@ class ESolidStand extends Group {
model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); model.trainParking && this.setColor(style.StationStand.solidStand.stopColor);
model.trainParking && this.setStroke(style.StationStand.solidStand.doorOpenColor); 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 { } else {
this.handlePassagerColor(model.num); this.handlePassagerColor(model.num);
} }

2
src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
View File

@ -230,7 +230,7 @@ export default {
parkingTime: this.control === '01' ? -1 : this.time, parkingTime: this.control === '01' ? -1 : this.time,
parkingAlwaysValid: this.control === '01' ? true : this.effective 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; this.loading = true;

2
src/utils/loaddata.js
View File

@ -58,7 +58,7 @@ export function handleMapData(mapData, type) {
} }
} }
export function loadRunPlanData(group, dataError) { export function loadRunPlanData(group, dataError) {
if (!store.state.runPlan.runPlanInfo) { if (!store.state.runPlan.runPlanInfo || !store.state.runPlan.runPlanInfo.templateId) {
MessageBox.confirm('未获取到运行图信息！', '提示', { MessageBox.confirm('未获取到运行图信息！', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
showCancelButton: false, showCancelButton: false,

2
src/views/planMonitor/editTool/menus/createEmptyPlan.vue
View File

@ -129,7 +129,7 @@ export default {
} }
}, },
doShow() { 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.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId;
this.dialogShow = true; this.dialogShow = true;
this.initLoad(); this.initLoad();

2
src/views/planMonitor/newEditTool/menus/createEmptyPlan.vue
View File

@ -129,7 +129,7 @@ export default {
} }
}, },
doShow() { 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.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId;
this.dialogShow = true; this.dialogShow = true;
this.initLoad(); this.initLoad();