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

merger

Browse Source
This commit is contained in:
fan 2020-07-17 19:08:42 +08:00
commit ba90420115
27 changed files with 40 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/shape/Train/EMouse.js
View File

@ -43,7 +43,7 @@ class EMouse extends Group {
}
let text = '';
let direction = this.device.model.right == 1;
if (store.state.map.mapConfig.upDirection == 'left') {
if (!store.state.map.mapConfig.upRight) {
direction = this.device.model.right != 1;
}
if (LangStorage.getLang() == 'en') {

2
src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
View File

@ -87,7 +87,7 @@ export default {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) {
this.stationList.forEach(item => {
if (item.code === this.$store.state.menuOperation.selected.stationCode) {
if ((this.mapConfig.upDirection === 'right' && this.$store.state.menuOperation.selected.right) || (this.mapConfig.upDirection === 'left' && !this.$store.state.menuOperation.selected.right)) {
if ((this.mapConfig.upRight && this.$store.state.menuOperation.selected.right) || (!this.mapConfig.upRight && !this.$store.state.menuOperation.selected.right)) {
this.title = item.name + '-上行行站台';
} else {
this.title = item.name + '-下行站台';

2
src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
View File

@ -156,7 +156,7 @@ export default {
return true;
}
});
if ((signalDirection && this.mapConfig.upDirection === 'right') || (!signalDirection && this.mapConfig.upDirection === 'left')) {
if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
return '上行';
} else {
return '下行';

2
src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
View File

@ -163,7 +163,7 @@ export default {
return true;
}
});
if ((signalDirection && this.mapConfig.upDirection === 'right') || (!signalDirection && this.mapConfig.upDirection === 'left')) {
if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
return '上行';
} else {
return '下行';

2
src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
View File

@ -178,7 +178,7 @@ export default {
return true;
}
});
if ((signalDirection && this.mapConfig.upDirection === 'right') || (!signalDirection && this.mapConfig.upDirection === 'left')) {
if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
return '上行';
} else {
return '下行';

2
src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
View File

@ -171,7 +171,7 @@ export default {
return true;
}
});
if ((signalDirection && this.mapConfig.upDirection === 'right') || (!signalDirection && this.mapConfig.upDirection === 'left')) {
if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
return '上行';
} else {
return '下行';

4
src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
View File

@ -416,10 +416,10 @@ export default {
});
},
getDirection(selected) {
if (this.mapConfig.upDirection === 'right') {
if (this.mapConfig.upRight) {
this.standName = selected.right ? '上行' : '下行';
this.isUpDirection = selected.right;
} else if (this.mapConfig.upDirection === 'left') {
} else if (!this.mapConfig.upRight) {
this.standName = selected.right ? '下行' : '上行';
this.isUpDirection = !selected.right;
}

4
src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
View File

@ -168,9 +168,9 @@ export default {
this.standName = '';
this.stationName = '';
if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
if (this.mapConfig.upDirection === 'right') {
if (this.mapConfig.upRight) {
this.standName = selected.right ? '上行' : '下行';
} else if (this.mapConfig.upDirection === 'left') {
} else if (!this.mapConfig.upRight) {
this.standName = selected.right ? '下行' : '上行';
}
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);

8
src/jmapNew/theme/components/menus/dialog/standControl.vue
View File

@ -217,7 +217,7 @@ export default {
}
}
this.radio = '2';
if ((this.selected.right && this.mapConfig.upDirection === 'right') || (!this.selected.right && this.mapConfig.upDirection === 'left')) { // 判断站台行驶方向
if ((this.selected.right && this.mapConfig.upRight) || (!this.selected.right && !this.mapConfig.upRight)) { // 判断站台行驶方向
this.radio = '1';
}
@ -241,7 +241,7 @@ export default {
this.radio1 = '2';
} else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
this.earlyDepar = true;
if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
if ((!this.selected.right && this.mapConfig.upRight) || (this.selected.right && !this.mapConfig.upRight)) {
this.radio2 = '2';
} else {
this.radio2 = '1';
@ -250,14 +250,14 @@ export default {
this.AutomaticBuckle = true;
this.autoRadio1 = '1';
this.autoRadio = '1';
if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
if ((!this.selected.right && this.mapConfig.upRight) || (this.selected.right && !this.mapConfig.upRight)) {
this.autoRadio = '2';
}
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
this.AutomaticBuckle = true;
this.autoRadio1 = '2';
this.autoRadio = '1';
if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
if ((!this.selected.right && this.mapConfig.upRight) || (this.selected.right && !this.mapConfig.upRight)) {
this.autoRadio = '2';
}
}

2
src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
View File

@ -227,7 +227,7 @@ export default {
}
}
this.radio1 = operate.operation;
this.isUpDirection = (this.mapConfig.upDirection === 'right' && selected.right) || (this.mapConfig.upDirection === 'left' && !selected.right);
this.isUpDirection = (this.mapConfig.upRight && selected.right) || (!this.mapConfig.upRight && !selected.right);
this.model.right = selected.right;
this.model.val1 = this.isUpDirection ? '02' : '01'; // 站台的上下行方向, 01:下行 /02:上行
this.model.val2 = '';

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

@ -159,7 +159,7 @@ export default {
if (!this.dialogShow) {
this.standStatus = '';
this.stationName = '';
this.upRight = this.mapConfig.upDirection === 'right';
this.upRight = this.mapConfig.upRight;
if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
this.standStatus = selected.right;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);

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

@ -127,7 +127,7 @@ export default {
if (!this.dialogShow) {
this.loading = false;
this.upDown = selected.right;
this.rightUp = this.mapConfig.upDirection === 'right';
this.rightUp = this.mapConfig.upRight;
this.loadTableData();
this.operation = operate.operation;
}

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

@ -163,7 +163,7 @@ export default {
this.control = selected.parkingTime ? '02' : '01';
this.time = selected.parkingTime ? selected.parkingTime : 15;
this.direction = selected.right;
this.upRight = this.mapConfig.upDirection === 'right';
this.upRight = this.mapConfig.upRight;
this.selected = selected || {};
}
this.dialogShow = true;

2
src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
View File

@ -161,7 +161,7 @@ export default {
if (!this.dialogShow) {
this.standStatus = '';
this.stationName = '';
this.upRight = this.mapConfig.upDirection === 'right';
this.upRight = this.mapConfig.upRight;
if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
this.standStatus = selected.right;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);

2
src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
View File

@ -127,7 +127,7 @@ export default {
if (!this.dialogShow) {
this.loading = false;
this.upDown = selected.right;
this.rightUp = this.mapConfig.upDirection === 'right';
this.rightUp = this.mapConfig.upRight;
this.loadTableData();
this.operation = operate.operation;
}

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

@ -151,7 +151,7 @@ export default {
this.control = selected.parkingTime ? '02' : '01';
this.time = selected.parkingTime ? selected.parkingTime : 30;
this.direction = selected.right;
this.upRight = this.mapConfig.upDirection === 'right';
this.upRight = this.mapConfig.upRight;
this.selected = selected || {};
}
this.dialogShow = true;

2
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -329,7 +329,7 @@ export default {
// 处理显示车站列表
// const list = [];
// let direction = this.selected.right == 1;
// if (this.$store.state.map.mapConfig.upDirection == 'left') {
// if (!this.$store.state.map.mapConfig.upRight) {
// direction = this.selected.right != 1;
// }
// let parentModel = this.selected.sectionModel;

2
src/jmapNew/theme/xian_02/menus/dialog/platformDwell.vue
View File

@ -142,7 +142,7 @@ export default {
this.selected = selected;
this.addModel.standCode = selected.code;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
if ((this.mapConfig.upDirection === 'right' && this.selected.right) || (this.mapConfig.upDirection === 'left' && !this.selected.right)) {
if ((this.mapConfig.upRight && this.selected.right) || (!this.mapConfig.upRight && !this.selected.right)) {
this.addModel.stationName = station.name + '-上行站台';
} else {
this.addModel.stationName = station.name + '-下行站台';

2
src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
View File

@ -152,7 +152,7 @@ export default {
this.addModel.oldStopProfile = '';
this.oldStopProfileLabel = '';
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
if ((this.mapConfig.upDirection === 'right' && this.selected.right) || (this.mapConfig.upDirection === 'left' && !this.selected.right)) {
if ((this.mapConfig.upRight && this.selected.right) || (!this.mapConfig.upRight && !this.selected.right)) {
this.addModel.stationName = station.name + '-上行站台';
} else {
this.addModel.stationName = station.name + '-下行站台';

2
src/jmapNew/theme/xian_02/menus/dialog/updateStandPlan.vue
View File

@ -165,7 +165,7 @@ export default {
this.addModel.standCode = selected.code;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
this.addModel.stationName = station.name;
if ((this.mapConfig.upDirection === 'right' && this.selected.right) || (this.mapConfig.upDirection === 'left' && !this.selected.right)) {
if ((this.mapConfig.upRight && this.selected.right) || (!this.mapConfig.upRight && !this.selected.right)) {
this.addModel.standDirection = '上行站台';
} else {
this.addModel.standDirection = '下行站台';

2
src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
View File

@ -154,7 +154,7 @@ export default {
this.addModel.standCode = selected.code;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
this.addModel.stationName = station.name;
if ((this.mapConfig.upDirection === 'right' && this.selected.right) || (this.mapConfig.upDirection === 'left' && !this.selected.right)) {
if ((this.mapConfig.upRight && this.selected.right) || (!this.mapConfig.upRight && !this.selected.right)) {
this.addModel.standDirection = '上行站台';
} else {
this.addModel.standDirection = '下行站台';

2
src/jmapNew/theme/xian_02/menus/menuStationStand.vue
View File

@ -179,7 +179,7 @@ export default {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation && this.operatemode !== OperateMode.FAULT) {
this.stationList.forEach(item => {
if (item.code === this.$store.state.menuOperation.selected.stationCode) {
if ((this.mapConfig.upDirection === 'right' && this.$store.state.menuOperation.selected.right) || (this.mapConfig.upDirection === 'left' && !this.$store.state.menuOperation.selected.right)) {
if ((this.mapConfig.upRight && this.$store.state.menuOperation.selected.right) || (!this.mapConfig.upRight && !this.$store.state.menuOperation.selected.right)) {
this.title = item.name + '-上行站台';
} else {
this.title = item.name + '-下行站台';

4
src/views/newMap/displayNew/menuTrainList.vue
View File

@ -73,9 +73,9 @@ export default {
// train.serviceNumber != '' && train.serviceNumber != undefined &&
const train = this.$store.getters['map/getDeviceByCode'](trainCode);
let isUpDirection;
if (this.mapConfig.upDirection === 'right') {
if (this.mapConfig.upRight) {
isUpDirection = train.right;
} else if (this.mapConfig.upDirection === 'left') {
} else if (!this.mapConfig.upRight) {
isUpDirection = !train.right;
}
if (train && isUpDirection && train.sectionCode) {

9
src/views/newMap/newMapdraft/ciConfig.vue
View File

@ -71,6 +71,7 @@ export default {
id: '',
height: 800,
initData: {
upRight: false,
signalApproachOnlyOne: false,
signalApproachOnlyNpSwitch: false,
routeNameUseEndOppositeSignalName: false,
@ -90,17 +91,17 @@ export default {
},
roadData: [],
focus: false,
booleanList: ['lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'overlapSettingByTrigger'],
selectList: ['upDirection'],
selectList: [],
numberList: ['overlapReleaseTime', 'routeReleaseTime'],
optionsMap: {
upDirection: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}]
// upRight: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}]
},
remarkMap: {
lockFirst: '是否先锁闭——办理过程直接先锁闭区段',
upDirection: '上行方向',
upRight: '上行是否向右',
switchSingleHandle: '道岔区段状态改变按单个道岔处理',
signalApproachOnlyOne: '信号机接近区段是否只取最近的一个',
signalApproachOnlyNpSwitch: ' 信号机接近区段是否仅考虑定位道岔',

22
src/views/newMap/newMapdraft/mapoperate/zcControl.vue
View File

@ -95,10 +95,7 @@ export default {
},
computed: {
...mapGetters('map', [
'sectionList',
'trainModelList',
'zcList',
'lineCode',
'stationList'
]),
form() {
@ -314,25 +311,6 @@ export default {
.card {
height: 100%;
}
.coordinate {
overflow: hidden;
.title {
text-align: right;
font-size: 14px;
color: #606266;
line-height: 40px;
padding: 0 12px 0 0;
-webkit-box-sizing: border-box;
box-sizing: border-box;
line-height: 28px;
width: 160px;
font-weight: bold;
display: block;
float: left;
}
}
.map-draft-group {
color: #3E44BE;
}

3
src/views/scriptManage/scriptRecord/getActionNew.vue
View File

@ -139,11 +139,10 @@ export default {
// const command = CommandHandler.getScriptDefinition(element.operationType);
const commandName = element.operationType;
let operateType = commandName.split('_')[0];
const data = commandName.toUpperCase();
if (operateType == 'CM') {
operateType = 'ControlConvertMenu';
}
const operateName = CMD[operateType]['CMD_' + data];
const operateName = Object.values(CMD[operateType]).find(res=>{ return res.value == commandName; });
const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机'};
const operateTypeName = deviceTypeList[operateType];
this.actionInfoList.push({id: element.id, isCoversition: false, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});

10
src/views/system/configLine/config.vue
View File

@ -75,18 +75,18 @@ export default {
height: 800,
roadData: [],
focus: false,
booleanList: ['lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock'],
selectList: ['upDirection', 'runMode'],
generalConfig: ['lockFirst', 'switchSingleHandle', 'upDirection', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM'],
booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock'],
selectList: ['runMode'],
generalConfig: ['lockFirst', 'switchSingleHandle', 'upRight', 'switchNRTurnChain', 'switchSingleLockChain', 'switchLossChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch', 'ctcOverlapOnlyTurnBackStationLock', 'noParkingSM', 'parkingSM'],
rangeList: ['noParkingSM', 'parkingSM'],
numberList: [],
optionsMap: {
upDirection: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}],
// upRight: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}],
runMode:[{label: 'CBTC级别', value: 'CBTC'}, {label: '点式通信', value: 'ITC'}, {label: '联锁级', value: 'IL'}]
},
remarkMap: {
lockFirst: '是否先锁闭——办理过程直接先锁闭区段',
upDirection: '上行方向',
upRight: '上行是否向右',
switchSingleHandle: '道岔区段状态改变按单个道岔处理',
switchNRTurnChain:'道岔正/反操是否联动',
switchSingleLockChain:'道岔单解/锁是否联动',