From 99088c9c4f27e1fa741f8b74babb3053074baabc Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 15 Nov 2021 09:41:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=90=E8=A1=8C=E7=AD=89=E7=BA=A7=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMapdraft/dataRelation/runLeveloperate/route.vue | 9 +++------ src/views/newMap/newMapdraft/index.vue | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue index 47897c7c4..5cafba6dd 100644 --- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue @@ -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(); diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue index ce171e015..a1265cf75 100644 --- a/src/views/newMap/newMapdraft/index.vue +++ b/src/views/newMap/newMapdraft/index.vue @@ -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) From dd83568d041d2bb71bc70854d4b67b4dac20b4b4 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 15 Nov 2021 09:50:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=90=E8=A1=8C=E7=AD=89=E7=BA=A7=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E8=B5=B7=E5=A7=8B=E5=8C=BA=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/newMapdraft/dataRelation/runLeveloperate/route.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue index 5cafba6dd..8b8826b30 100644 --- a/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/runLeveloperate/route.vue @@ -354,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; From 35ee7a245bb1e80c512c9d59b18b345165044bc1 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 15 Nov 2021 13:22:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E8=87=AA=E6=8E=92?= =?UTF-8?q?=E5=BC=80=E8=87=AA=E6=8E=92=E5=85=B3=E9=97=AE=E9=A2=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/menus/dialog/routeHandControl.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue index 5106f91c1..d923fecdd 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue @@ -315,6 +315,7 @@ export default { }, allSelectChange() { this.changeList = []; + this.selection = []; if (this.allSelect) { this.tempData.forEach((item, index)=> { if (!item.disabled) { From b2a5e3723c17cd0dc557f018a09d946ba7e6a519 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 15 Nov 2021 17:29:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=AD=97=E5=85=B8=20=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/cmdPlugin/CommandEnum.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 69250b19f..b74bf9bd0 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -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:'确认'} }, // 信号机操作 From a0cdca405ae5a8d18d229d2b6b4e0da20c71cbc9 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 15 Nov 2021 18:13:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../displayNew/scriptDisplay/component/covertOperation.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js index 37152686b..936eea83c 100644 --- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js +++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js @@ -184,6 +184,10 @@ export const operateEnum = { Driver_Drive_Mode_Change:{ code:'driveMode', name:'模式为' + }, + Driver_Door_Selection:{ + code:'doorSelection', + name:'方向为' } }, TrainWindow:{