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:
fan 2022-07-08 17:45:21 +08:00
commit e300d62896
5 changed files with 108 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -624,6 +624,21 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.cancleBlock.menu.operation,
cmdType: CMD.CTC.CTC_LOG_CANCEL_BLOCK
},
// 设置重点列车
setKeyTrains:{
operation: OperationEvent.CTCCommand.setKeyTrains.menu.operation,
cmdType: CMD.CTC.CTC_LOG_SET_KEY_TRAINS
},
// 设置允许出入口与基本路径不一致
setEntryOutDiscordant:{
operation: OperationEvent.CTCCommand.setEntryOutDiscordant.menu.operation,
cmdType: CMD.CTC.CTC_LOG_SET_ENTRY_OUT_DISCORDANT
},
// 设置允许股道与基本路径不一致
setTrackDiscordant:{
operation: OperationEvent.CTCCommand.setTrackDiscordant.menu.operation,
cmdType: CMD.CTC.CTC_LOG_SET_TRACK_DISCORDANT
},
// 增加列车固定径路
addTrainFixedPath:{

69
src/jmapNew/theme/datie_02/menus/runplanPane.vue
View File

@ -418,11 +418,14 @@
<div class="runplanTableNo">31</div>
</template>
</el-table-column>
<el-table-column width="70">
<el-table-column width="70" prop="planProperties">
<template slot="header">
<div class="runplanTableTname runplanTwo2Level">计<br>划<br>属<br>性</div>
<div class="runplanTableNo">32</div>
</template>
<template slot-scope="scope">
<div>{{ scope.row.planProperties }}</div>
</template>
</el-table-column>
<el-table-column width="70">
<template slot="header">
@ -446,6 +449,10 @@
<div class="eachRpSep" />
<div class="eachRpMenu" @click="clearFlash">清除闪烁</div>
<div class="eachRpMenu">全体信息</div>
<div class="eachRpSep" />
<div class="eachRpMenu" @click="setKeyTrains">设置取消重点列车</div>
<div class="eachRpMenu" @click="setTrackDiscordant">允许股道与基本路径不一致</div>
<div class="eachRpMenu" @click="setEntryOutDiscordant">允许出入口与基本路径不一致</div>
</div>
</div>
</div>
@ -876,6 +883,66 @@ export default {
});
}
},
// 设置重点列车
setKeyTrains() {
if (this.currentRow) {
event.stopPropagation();
this.rpMenuPopShow = false;
const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
params.status = this.currentRow.keyTrains ? 0 : 1;
commitOperate(menuOperate.CTC.setKeyTrains, params, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
// 设置允许出入口与基本路径不一致
setEntryOutDiscordant() {
if (this.currentRow) {
event.stopPropagation();
this.rpMenuPopShow = false;
const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
params.status = this.currentRow.entryOutDiscordant ? 0 : 1;
commitOperate(menuOperate.CTC.setEntryOutDiscordant, params, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
// 设置允许股道与基本路径不一致
setTrackDiscordant() {
if (this.currentRow) {
event.stopPropagation();
this.rpMenuPopShow = false;
const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
params.status = this.currentRow.trackDiscordant ? 0 : 1;
commitOperate(menuOperate.CTC.setTrackDiscordant, params, 3).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
// this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.noticeInfo();
});
}
},
// 发送发车预告
sendNotcie() {
// && this.currentRow.departRunPlan && this.currentRow.departRunPlan.adjacentMessage == 0

3
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -409,6 +409,9 @@ export default {
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_LOG_SET_KEY_TRAINS:{value: 'CTC_LOG_SET_KEY_TRAINS', label: '设置重点列车'},
CTC_LOG_SET_ENTRY_OUT_DISCORDANT:{value: 'CTC_LOG_SET_ENTRY_OUT_DISCORDANT', label: '设置允许出入口与基本路径不一致'},
CTC_LOG_SET_TRACK_DISCORDANT:{value: 'CTC_LOG_SET_TRACK_DISCORDANT', 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: '导入列车固定径路'},

22
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -3876,8 +3876,28 @@ export const OperationEvent = {
operation: '1139',
domId: '_Tips-CTC-cancleBlock-Menu{TOP}'
}
},
// 设置重点列车
setKeyTrains:{
menu: {
operation: '1140',
domId: '_Tips-CTC-setKeyTrains-Menu{TOP}'
}
},
// 设置允许出入口与基本路径不一致
setEntryOutDiscordant:{
menu: {
operation: '1140',
domId: '_Tips-CTC-setEntryOutDiscordant-Menu{TOP}'
}
},
// 设置允许股道与基本路径不一致
setTrackDiscordant:{
menu: {
operation: '1140',
domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
}
}
// CTC_ZONE_SAVE_TRIP_NUMBER
// CTC_ZONE_SAVE_STATION
},

2
src/views/newMap/displayCity/lineBoard.vue
View File

@ -389,7 +389,7 @@ export default {
if (item && item.trackView && item.trackView.deletedMap) {
for (const key in item.trackView.deletedMap) {
if (this.standTrackSectionMap[key] && item.trackView.deletedMap[key] && item.trackView.deletedMap[key].length) {
const sectionMap = this.standTrackSectionMap[key];
const sectionMap = this.standTrackSectionMap[key].lineMap;
item.trackView.deletedMap[key].forEach(trainCode => {
delete sectionMap[trainCode];
});