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

宁波福州佛山默认不显示道岔区段的名称调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-08-31 10:13:26 +08:00
parent e6f7ade236
commit 8027bc90ae
5 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
View File

@ -197,20 +197,20 @@ export default {
const sectionList = this.$store.getters['map/sectionList']; const sectionList = this.$store.getters['map/sectionList'];
if (sectionList && sectionList.length > 0) { if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => { sectionList.forEach(elem => {
if (elem.isSwitchSection && elem.parentCode) { // if (elem.switchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示 // // 道岔轨的区段名称默认不显示
nameShow = false; // nameShow = false;
} else { // } else {
if (elem.type === '01') { if (elem.type === '01') {
nameShow = this.nameLevels.indexOf(11) !== -1; nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') { } else if (elem.type === '02') {
// 轨道轨名称 // 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1; nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') { } else if (elem.type === '03') {
// 道岔区段名称 // 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1; nameShow = this.nameLevels.indexOf(9) !== -1;
}
} }
// }
// 站台轨名称 // 站台轨名称
if (elem.isStandTrack) { if (elem.isStandTrack) {

28
src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
View File

@ -197,21 +197,21 @@ export default {
if (sectionList && sectionList.length > 0) { if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => { sectionList.forEach(elem => {
elem._type = deviceType.Section; elem._type = deviceType.Section;
if (elem.isSwitchSection && elem.parentCode) { // if (elem.switchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示 // // 道岔轨的区段名称默认不显示
nameShow = false; // nameShow = false;
} else { // } else {
if (elem.type === '01') { if (elem.type === '01') {
// 计轴区段名称 // 计轴区段名称
nameShow = this.nameLevels.indexOf(11) !== -1; nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') { } else if (elem.type === '02') {
// 轨道轨名称 // 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1; nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') { } else if (elem.type === '03') {
// 道岔区段名称 // 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1; nameShow = this.nameLevels.indexOf(9) !== -1;
}
} }
// }
// 站台轨名称 // 站台轨名称
if (elem.isStandTrack) { if (elem.isStandTrack) {

2
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -563,7 +563,7 @@ export default {
minDuration: 5, minDuration: 5,
operateType: 'Signal_Reopen_Signal', operateType: 'Signal_Reopen_Signal',
skinCode: '06', skinCode: '06',
trainingName: '信号重开({3} 进路)', trainingName: '信号重开({5})',
trainingRemark: '信号重开功能', trainingRemark: '信号重开功能',
trainingType: 'Signal', trainingType: 'Signal',
productTypes: ['01', '02'], productTypes: ['01', '02'],

28
src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
View File

@ -199,21 +199,21 @@ export default {
if (sectionList && sectionList.length > 0) { if (sectionList && sectionList.length > 0) {
sectionList.forEach(elem => { sectionList.forEach(elem => {
elem._type = deviceType.Section; elem._type = deviceType.Section;
if (elem.isSwitchSection && elem.parentCode) { // if (elem.switchSection && elem.parentCode) {
// 道岔轨的区段名称默认不显示 // // 道岔轨的区段名称默认不显示
nameShow = false; // nameShow = false;
} else { // } else {
if (elem.type === '01') { if (elem.type === '01') {
// 计轴区段名称 // 计轴区段名称
nameShow = this.nameLevels.indexOf(11) !== -1; nameShow = this.nameLevels.indexOf(11) !== -1;
} else if (elem.type === '02') { } else if (elem.type === '02') {
// 轨道轨名称 // 轨道轨名称
nameShow = this.nameLevels.indexOf(5) !== -1; nameShow = this.nameLevels.indexOf(5) !== -1;
} else if (elem.type === '03') { } else if (elem.type === '03') {
// 道岔区段名称 // 道岔区段名称
nameShow = this.nameLevels.indexOf(9) !== -1; nameShow = this.nameLevels.indexOf(9) !== -1;
}
} }
// }
// 站台轨名称 // 站台轨名称
standTrackNameShow = this.nameLevels.indexOf(2) !== -1; standTrackNameShow = this.nameLevels.indexOf(2) !== -1;

5
src/store/modules/map.js
View File

@ -61,7 +61,10 @@ function queryDeleteModels(state, device, dict) {
} }
} }
copyModel.relSwitchCode = ''; copyModel.relSwitchCode = '';
// 旧版地图 判断是否道岔区段为isSwitchSection，新版地图已经更换为switchSection
// 此处为了兼容旧版，暂时没有删除isSwitchSection，待旧版地图删除之后需要删除isSwitchSection
copyModel.isSwitchSection = false; copyModel.isSwitchSection = false;
copyModel.switchSection = false;
copyModel.type = '01'; copyModel.type = '01';
dict[elem.code] = copyModel; dict[elem.code] = copyModel;
} }
@ -787,7 +790,7 @@ const map = {
state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => { state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
state.routeData[item.automaticRouteCode].automaticRouteCode = item.code; state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
}); });
state.routeList = routeDataList; state.routeList = routeDataList;
}, },
setOverlapData: (state, overlapList) => { setOverlapData: (state, overlapList) => {
state.overlapData = {}; state.overlapData = {};