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:
sunzhenyu 2021-11-19 15:05:23 +08:00
commit 94de3ba762
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
View File

@ -315,6 +315,7 @@ export default {
},
allSelectChange() {
this.changeList = [];
this.selection = [];
if (this.allSelect) {
this.tempData.forEach((item, index)=> {
if (!item.disabled) {

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

@ -80,7 +80,13 @@ export default {
CMD_DRIVER_CHANGE_HEAD:{value:'Driver_Change_Head', label:'换端'},
CMD_DRIVER_DOOR_ON_OFF:{value:'Driver_Door_On_Off', label:'列车车门开关'},
CMD_DRIVER_NEXT_STATION:{value:'Driver_Next_Station', label:'确认列车行驶之前方站台'},
CMD_DRIVER_BLOCK_ROUTE:{value:'Driver_Block_Route', label:'进路闭塞法行车'}
CMD_DRIVER_BLOCK_ROUTE:{value:'Driver_Block_Route', label:'进路闭塞法行车'},
CMD_DRIVER_PRESELECTION_MODE_DOWN:{value:'Driver_Preselection_Mode_Down', label:'列车预选模式降'},
CMD_DRIVER_PRESELECTION_MODE_UP:{value:'Driver_Preselection_Mode_Up', label:'列车预选模式升'},
CMD_DRIVER_DOOR_MODE:{value:'Driver_Door_Mode', label:'列车门模式'},
CMD_DRIVER_DOOR_SELECTION:{value:'Driver_Door_Selection', label:'列车门选择'},
CMD_DRIVER_CONFIRM:{value:'Driver_Confirm', label:'确认'}
},
// 信号机操作

4
src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
View File

@ -184,6 +184,10 @@ export const operateEnum = {
Driver_Drive_Mode_Change:{
code:'driveMode',
name:'模式为'
},
Driver_Door_Selection:{
code:'doorSelection',
name:'方向为'
}
},
TrainWindow:{

12
src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue
View File

@ -200,11 +200,6 @@ export default {
}
},
watch: {
mapInfo(val) {
if (val) {
this.addModel.mapId = val.id;
}
},
routeData(val, old) {
if (val) {
this.addModel = val;
@ -253,6 +248,7 @@ export default {
this.display = true;
},
generateLevel() { // 生成运行等级
this.addModel.mapId = this.mapInfo.id;
this.$refs.form.validate(async (valid) => {
if (valid) {
postGenerateLevel(this.addModel).then(res=>{
@ -291,9 +287,9 @@ export default {
save() {
this.$refs.form.validate(async (valid) => {
if (valid) {
if (this.editShow) {
this.loading = true;
this.addModel.mapId = this.mapInfo.id;
putUploadLevel(this.runLevelId, this.addModel).then(res => { // 更新内容
this.$message.success('更新成功');
this.clear();
@ -305,6 +301,7 @@ export default {
} else {
if (this.display) {
this.loading = true;
this.addModel.mapId = this.mapInfo.id;
postSaveLevel(this.addModel).then(res => { // 保存
this.$message.success('保存成功');
this.clear();
@ -357,11 +354,10 @@ export default {
this.addModel.endStationCode = selected.code;
} else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'startSectionCode'.toUpperCase()) {
if (selected.standTrack || selected.reentryTrack || selected.transferTrack) {
this.addModel.endSectionCode = selected.code;
this.addModel.startSectionCode = selected.code;
} else {
this.$message.error('请选择正确的起始区段');
}
this.addModel.startSectionCode = selected.code;
} else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'endSectionCode'.toUpperCase()) {
if (selected.standTrack || selected.reentryTrack || selected.transferTrack) {
this.addModel.endSectionCode = selected.code;

1
src/views/newMap/newMapdraft/index.vue
View File

@ -274,6 +274,7 @@ export default {
loadInitPage() {
this.$store.dispatch('training/changeMode', { mode: TrainingMode.MAP_EDIT });
this.mapInfo = { name: this.$t('map.pleaseSelectMap'), id: this.$route.params.mapId };
console.log(this.mapInfo, '======================');
if (parseInt(this.mapInfo.id)) {
this.mapInfo.name = this.$route.query.name;
getMapDetail(this.$route.params.mapId)