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-03-04 09:17:06 +08:00
parent 9c1c48b968
commit 33d711cf49
11 changed files with 189 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
View File

@ -183,7 +183,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 信号关灯
@ -203,7 +203,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 信号重开
@ -223,7 +223,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 取消进路
@ -243,7 +243,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 进路交人工控
@ -263,7 +263,7 @@ export default {
}).catch(error => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 进路交ATS自动控
@ -283,7 +283,7 @@ export default {
}).catch(error => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 设置运行等级
@ -304,7 +304,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 停站时间
@ -325,7 +325,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 设置折返策略
@ -346,7 +346,7 @@ export default {
}).catch((error) => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
cancel() {
@ -359,7 +359,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.doClose();
});
}

8
src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
View File

@ -122,12 +122,12 @@
}
this.loading = true;
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
this.$refs.noticeInfo.doShow(operate);
@ -139,11 +139,11 @@
operation: OperationEvent.Command.cancel.menu.operation,
}
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.doClose();
});
}

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

@ -218,7 +218,7 @@ export default {
val: row.code
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}

1
src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
View File

@ -139,7 +139,6 @@ export default {
clickEvent(row, column, event) {
const operate = {
operation: OperationEvent.StationStand.setBackStrategy.choose.operation,
val: `${row.value}`,
};
this.strategy = row.value;
this.isConfirm = true;

1
src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
View File

@ -309,6 +309,7 @@ export default {
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 提前发车
earlyDeparture() {
const operate = {

7
src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
View File

@ -270,6 +270,7 @@ export default {
this.$refs.noticeInfo.doShow(operate, [error.message]);
});
},
// 取消跳停
cancelJumpStop() {
// let val = this.model.val1;
@ -319,7 +320,6 @@ export default {
this.model.val2 = val;
this.model.val1 = '';
const operate = {
type: MapDeviceType.StationStand.type,
operation: operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@ -333,7 +333,6 @@ export default {
? OperationEvent.StationStand.setJumpStop.selfStationStand.operation : OperationEvent.StationStand.cancelJumpStop.selfStationStand.operation;
this.model.val1 = val;
const operate = {
type: MapDeviceType.StationStand.type,
operation: operation
};
this.model.val2 = '';
@ -348,9 +347,7 @@ export default {
? OperationEvent.StationStand.setJumpStop.select.operation : OperationEvent.StationStand.cancelJumpStop.select.operation;
this.model.val1 = '';
const operate = {
type: MapDeviceType.StationStand.type,
operation: operation,
val: val
operation: operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

18
src/jmapNew/theme/beijing_01/menus/dialog/standRunLevel.vue
View File

@ -241,10 +241,10 @@ export default {
}
},
timeSelectChange(time) {
let operate = {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.choose.operation,
val: time.toString(),
}
};
this.time = time.toString();
this.isSelect = false;
@ -256,7 +256,7 @@ export default {
})
},
levelSelectChange(row) {
let operate = {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.chooseLevel.operation,
val: row.level.toString(),
}
@ -268,19 +268,19 @@ export default {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
})
});
},
checkChange(check) {
let operate = {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.check.operation,
val: check.toString(),
}
val: check.toString()
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
})
});
},
doClose() {
this.loading = false;
@ -318,7 +318,7 @@ export default {
}
},
cancel() {
let operate = {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation,
};

1
src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue
View File

@ -219,7 +219,6 @@ export default {
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
param: {
parkingTime: this.control == '01' ? -1 : 1,
// runLevelTime: this.time,
parkingAlwaysValid: this.effective == '1'
}
// messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]

15
src/jmapNew/theme/beijing_01/menus/menuSignal.vue
View File

@ -208,6 +208,7 @@ export default {
setStoppage() {
const operate = {
start: true,
over: true,
code: `${this.selected.code}`,
operation: OperationEvent.Signal.stoppage.menu.operation,
cmdType: CMD.Signal.CMD_SIGNAL_ADD_FAULT,
@ -232,6 +233,7 @@ export default {
cancelStoppage() {
const operate = {
start: true,
over: true,
code: this.selected.code,
cmdType: CMD.Signal.CMD_SIGNAL_REMOVE_FAULT,
operation: OperationEvent.Signal.cancelStoppage.menu.operation,
@ -255,10 +257,7 @@ export default {
arrangementRoute() {
const operate = {
start: true,
// send: true,
code: this.selected.code,
// type: MapDeviceType.Signal.type,
// label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.arrangementRoute.menu.operation
// param: {
// signalCode: `${this.selected.code}`
@ -325,7 +324,7 @@ export default {
// label: MapDeviceType.Signal.label,
// operation: OperationEvent.Signal.unlock.menu.operation
// };
// this.$store.dispatch('training/next', operate).then(({ valid }) => {
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
// if (valid) {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// this.$refs.routeCmdControl.doShow(operate, this.selected);
@ -370,10 +369,7 @@ export default {
humanControl() {
const operate = {
start: true,
// send: true,
code: this.selected.code,
// type: MapDeviceType.Signal.type,
// label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.humanControl.menu.operation,
param: {
signalCode: `${this.selected.code}`
@ -396,16 +392,13 @@ export default {
atsAutoControl() {
const operate = {
start: true,
// send: true,
code: this.selected.code,
// type: MapDeviceType.Signal.type,
// label: MapDeviceType.Signal.label,
operation: OperationEvent.Signal.atsAutoControl.menu.operation,
param: {
signalCode: `${this.selected.code}`
}
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
const routes = [];

133
src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
View File

@ -55,72 +55,72 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '设置扣车',
handler: this.setDetainTrain,
cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
auth: { station: true, center: false }
},
{
label: '取消扣车',
handler: this.cancelDetainTrain,
cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
auth: { station: true, center: true }
},
{
label: '设置跳停',
handler: this.setJumpStop,
cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
auth: { station: true, center: false }
},
{
label: '取消跳停',
handler: this.cancelJumpStop,
cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
auth: { station: true, center: true }
},
{
type: 'separator'
},
{
label: '提前发车',
handler: this.earlyDeparture,
cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
auth: { station: true, center: true }
},
{
label: '设置停站时间',
handler: this.setStopTime,
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
auth: { station: true, center: true }
},
{
type: 'separator'
},
{
label: '站台详细信息',
handler: this.detail,
cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
auth: { station: true, center: true }
},
{
label: '运行时间控制',
handler: this.setRunLevel,
cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
auth: { station: false, center: false }
},
{
label: '设置提前发车',
handler: this.earlyDeparture,
cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
auth: { station: false, center: false }
},
{
label: '人工折返策略设置',
handler: this.setBackStrategy,
cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
auth: { station: false, center: false }
}
// {
// label: '设置扣车',
// handler: this.setDetainTrain,
// cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
// auth: { station: true, center: false }
// },
// {
// label: '取消扣车',
// handler: this.cancelDetainTrain,
// cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
// auth: { station: true, center: true }
// },
// {
// label: '设置跳停',
// handler: this.setJumpStop,
// cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
// auth: { station: true, center: false }
// },
// {
// label: '取消跳停',
// handler: this.cancelJumpStop,
// cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
// auth: { station: true, center: true }
// },
// {
// type: 'separator'
// },
// {
// label: '提前发车',
// handler: this.earlyDeparture,
// cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
// auth: { station: true, center: true }
// },
// {
// label: '设置停站时间',
// handler: this.setStopTime,
// cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
// auth: { station: true, center: true }
// },
// {
// type: 'separator'
// },
// {
// label: '站台详细信息',
// handler: this.detail,
// cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
// auth: { station: true, center: true }
// },
// {
// label: '运行时间控制',
// handler: this.setRunLevel,
// cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
// auth: { station: false, center: false }
// },
// {
// label: '设置提前发车',
// handler: this.earlyDeparture,
// cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
// auth: { station: false, center: false }
// },
// {
// label: '人工折返策略设置',
// handler: this.setBackStrategy,
// cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
// auth: { station: false, center: false }
// }
// {
// label: '查询站台状态',
// handler: this.detail,
@ -462,7 +462,6 @@ export default {
setBackStrategy() {
const operate = {
start: true,
// send: true,
code: this.selected.code,
operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
param:{

4
src/scripts/cmdPlugin/MenuContextHandler.js
View File

@ -94,8 +94,8 @@ class MenuContextHandler {
if (control) {
if (this.getPrdType() != '') {
const type = State2SimulationMap[this.getPrdType()];
// const status = State2ControlMap[control.controlMode]; // 判断当前模式
const status = 'LocalStationControl';
const status = State2ControlMap[control.controlMode]; // 判断当前模式
// const status = 'LocalStationControl';
menu = [...menuList[type]];
// 特殊处理站台的右键操作( 因为小站台不允许有操作 )
if (selected._type == 'StationStand') {