大铁项目 ctc 行车日志 取消到达 取消出发 取消闭塞 指令添加

This commit is contained in:
joylink_cuiweidong 2022-07-08 16:52:06 +08:00
parent d0f4c4b5cd
commit af992f8664
4 changed files with 108 additions and 9 deletions

View File

@ -609,6 +609,22 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.agreeNotcie.menu.operation,
cmdType: CMD.CTC.CTC_AGREE_NOTICE
},
// 取消到达
cancleArrive:{
operation: OperationEvent.CTCCommand.cancleArrive.menu.operation,
cmdType: CMD.CTC.CTC_LOG_CANCEL_ARRIVE
},
// 取消出发
cancleDepature:{
operation: OperationEvent.CTCCommand.cancleDepature.menu.operation,
cmdType: CMD.CTC.CTC_LOG_CANCEL_DEPARTURE
},
// 取消闭塞
cancleBlock:{
operation: OperationEvent.CTCCommand.cancleBlock.menu.operation,
cmdType: CMD.CTC.CTC_LOG_CANCEL_BLOCK
},
// 增加列车固定径路
addTrainFixedPath:{
operation: OperationEvent.CTCCommand.addTrainFixedPath.menu.operation,

View File

@ -64,9 +64,9 @@
<div class="runplanContentBtn">出发(F4)</div>
<div class="runplanContentBtn">通过(F11)</div>
<div class="runplanContentBtn">邻站(F6)</div>
<div class="runplanContentBtn">取消接车(Esc)</div>
<div class="runplanContentBtn">取消闭塞(F6)</div>
<div class="runplanContentBtn">取消发车(F7)</div>
<div class="runplanContentBtn" @click="cancleArrive">取消接车(Esc)</div>
<div class="runplanContentBtn" @click="cancleBlock">取消闭塞(F6)</div>
<div class="runplanContentBtn" @click="cancleDepature">取消发车(F7)</div>
</div>
</div>
<div class="runplanContentR">
@ -655,6 +655,7 @@ export default {
: prev.arriveRunPlan ? (prev.arriveRunPlan.actualTime || prev.arriveRunPlan.planTime) : '00:00:00';
const nextPlanTime = next.departRunPlan ? (next.departRunPlan.actualTime || next.departRunPlan.planTime)
: next.arriveRunPlan ? (next.arriveRunPlan.actualTime || next.arriveRunPlan.planTime) : '00:00:00';
// console.log(prevPlanTime, nextPlanTime, '66666666');
// const nextPlanTime = next.departRunPlan ? next.departRunPlan.planTime : next.arriveRunPlan ? next.arriveRunPlan.planTime : '00:00:00';
return new Date('2000-06-18 ' + prevPlanTime).getTime() - new Date('2000-06-18 ' + nextPlanTime).getTime();
});
@ -710,6 +711,9 @@ export default {
this.stageRunplan();
break;
}
// Esc
// F6
// F7
}
}
},
@ -877,7 +881,7 @@ export default {
// && this.currentRow.departRunPlan && this.currentRow.departRunPlan.adjacentMessage == 0
if (this.currentRow && this.currentRow.departRunPlan) {
this.loading = true;
commitOperate(menuOperate.CTC.sendNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 2).then(({valid})=>{
commitOperate(menuOperate.CTC.sendNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
// if (valid) {
@ -892,10 +896,64 @@ export default {
}
},
//
agreeNotcie() {
if (this.currentRow && this.currentRow.arriveRunPlan && this.currentRow.arriveRunPlan.adjacentMessage == 1) {
commitOperate(menuOperate.CTC.agreeNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 2).then(({valid})=>{
//
cancleArrive() {
if (this.currentRow && this.currentRow.arriveRunPlan) {
//
commitOperate(menuOperate.CTC.cancleArrive, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
//
cancleDepature() {
if (this.currentRow && this.currentRow.departRunPlan) {
commitOperate(menuOperate.CTC.cancleDepature, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
//
cancleBlock() {
if (this.currentRow &&
(
(this.currentRow.departRunPlan && this.currentRow.departRunPlan.adjacentMessage == 1) ||
(this.currentRow.arriveRunPlan && this.currentRow.arriveRunPlan.adjacentMessage == 1)
)
) {
commitOperate(menuOperate.CTC.cancleBlock, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
//
agreeNotcie() {
if (this.currentRow && this.currentRow.arriveRunPlan && this.currentRow.arriveRunPlan.adjacentMessage == 1) {
commitOperate(menuOperate.CTC.agreeNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
@ -904,7 +962,6 @@ export default {
}).catch(() => {
this.loading = false;
this.clearRpRow();
// this.doClose();
this.noticeInfo();
});
}

View File

@ -406,6 +406,10 @@ export default {
CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'},
CTC_SEND_NOTICE:{value: 'CTC_SEND_NOTICE', label: '发送发车预告'},
CTC_AGREE_NOTICE:{value: 'CTC_AGREE_NOTICE', label: '同意发车预告'},
CTC_LOG_CANCEL_ARRIVE:{value: 'CTC_LOG_CANCEL_ARRIVE', label: '取消到达'},
CTC_LOG_CANCEL_DEPARTURE:{value: 'CTC_LOG_CANCEL_DEPARTURE', label: '取消出发'},
CTC_LOG_CANCEL_BLOCK:{value: 'CTC_LOG_CANCEL_BLOCK', label: '取消闭塞'},
CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA', label: '增加列车固定径路'},
CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA', label: '导入列车固定径路'},
CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA:{value: 'CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA', label: '删除列车固定径路'},

View File

@ -3855,7 +3855,29 @@ export const OperationEvent = {
operation: '1136',
domId: '_Tips-CTC-modifyDispatcherLogerRpDirection-Menu{TOP}'
}
},
// 取消到达
cancleArrive:{
menu: {
operation: '1137',
domId: '_Tips-CTC-cancleArrive-Menu{TOP}'
}
},
// 取消出发
cancleDepature:{
menu: {
operation: '1138',
domId: '_Tips-CTC-cancleDepature-Menu{TOP}'
}
},
// 取消闭塞
cancleBlock:{
menu: {
operation: '1139',
domId: '_Tips-CTC-cancleBlock-Menu{TOP}'
}
}
// CTC_ZONE_SAVE_TRIP_NUMBER
// CTC_ZONE_SAVE_STATION
},