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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-01-21 19:19:41 +08:00
commit 5d7810b6f9
2 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jmapNew/shape/Signal/index.js
View File

@ -625,7 +625,7 @@ class Signal extends Group {
if (this.style.Signal.post.autoRouteColor) { if (this.style.Signal.post.autoRouteColor) {
this.sigPost.setColor(this.style.Signal.post.autoRouteColor); this.sigPost.setColor(this.style.Signal.post.autoRouteColor);
} else if (this.style.Signal.post.autoRouteVerColor) { } else if (this.style.Signal.post.autoRouteVerColor) {
this.sigPost.setVerColor(this.style.Signal.post.setVerColor); this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor);
} }
} }
@ -801,11 +801,11 @@ class Signal extends Group {
}); });
} }
} }
if ( model.level === 3) { if ( model.level === 3 && !model.fleetMode) {
this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor); this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor);
} else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor) { } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) {
this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor);
} else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor) { } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) {
this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor);
} }
// 信号机故障 // 信号机故障

33
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -206,7 +206,7 @@ export default {
item: [ item: [
{ prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.centralizedStationList, isHidden: this.isStationCodeDisabled }, { prop: 'stationCode', label: this.$t('map.equipmentStation') + ':', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.centralizedStationList, isHidden: this.isStationCodeDisabled },
{ prop: 'belongStation', label: '所属车站:', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, isHidden: !this.editModel.standTrack && !this.editModel.reentryTrack && !this.editModel.transferTrack }, { prop: 'belongStation', label: '所属车站:', type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, isHidden: !this.editModel.standTrack && !this.editModel.reentryTrack && !this.editModel.transferTrack },
{ prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), isHidden: !this.isSwitchSectionType || !this.isCrossSectionType }, { prop: 'lengthFact', label: this.$t('map.actualLength') + ':', type: 'number', min: 0, placeholder: this.$t('map.meter'), disabled: this.isStationCodeDisabled, isHidden: !this.isSwitchSectionType || !this.isCrossSectionType },
{ prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量 { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量
{ prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量 { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量
{ prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow }, { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
@ -560,38 +560,11 @@ export default {
const pointModel = []; const pointModel = [];
const slope1 = (this.oldPoint[this.oldPoint.length - 1].y - this.oldPoint[0].y) / (this.oldPoint[this.oldPoint.length - 1].x - this.oldPoint[0].x); const slope1 = (this.oldPoint[this.oldPoint.length - 1].y - this.oldPoint[0].y) / (this.oldPoint[this.oldPoint.length - 1].x - this.oldPoint[0].x);
this.sectionList.forEach(section => { this.sectionList.forEach(section => {
if (section.type == '02') {
// section.parentCode
// const sectionModel = this.$store.getters['map/getDeviceByCode'](section.parentCode);
// const copySection = deepAssign({}, sectionModel);
// // if (section.leftSectionCode) {
// // console.log(section.leftSectionCode, '111111');
// // }
// if (section.rightSectionCode) {
// const sectionModel1 = this.$store.getters['map/getDeviceByCode'](section.rightSectionCode);
// if (sectionModel1.type == '02') {
// copySection.rightSectionCode = sectionModel1.parentCode;
// } else {
// copySection.rightSectionCode = section.rightSectionCode;
// }
// console.log(section.rightSectionCode, '22222');
// }
// models.push(copySection);
// console.log(section.rightSectionCode, section.leftSectionCode);
// const copySection = deepAssign({}, section);
// if (section.rightSectionCode) {
// delete copySection.rightSectionCode;
// }
// if (section.leftSectionCode) {
// delete copySection.leftSectionCode;
// }
// models.push(copySection);
}
if (section.parentCode == model.code && section.type == '02') { // 逻辑区段 if (section.parentCode == model.code && section.type == '02') { // 逻辑区段
const copySection = deepAssign({}, section); const copySection = deepAssign({}, section);
copySection.stationCode = model.stationCode; // 给元素 子逻辑区段设置 设备集中站 copySection.stationCode = model.stationCode; // 给元素 子逻辑区段设置 设备集中站
const length = model.lengthFact / model.logicSectionCodeList.length; // const length = model.lengthFact / model.logicSectionCodeList.length;
copySection.lengthFact = length.toFixed(3); // copySection.lengthFact = length.toFixed(3);
if (this.checkPointsCoincide(this.oldPoint[0], copySection.points[0])) { if (this.checkPointsCoincide(this.oldPoint[0], copySection.points[0])) {
copySection.points[0] = model.points[0]; copySection.points[0] = model.points[0];
} }