From 6afae4e1bc15a778c558dd1034b27e42500d1e13 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 24 Aug 2020 16:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89=E4=BA=8C?= =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E6=8E=92=E5=88=97=E8=BF=9B=E8=B7=AF=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xian_02/menus/dialog/trainDestination.vue | 87 +++++++++++++------ .../theme/xian_02/menus/menuSignal.vue | 16 ++-- src/jmapNew/theme/xian_02/menus/menuTrain.vue | 4 +- src/store/modules/map.js | 2 +- src/utils/loaddata.js | 2 +- 5 files changed, 73 insertions(+), 38 deletions(-) diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue index c5239d392..c4a5c3df1 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue @@ -11,35 +11,42 @@ :close-on-click-modal="false" > - 车体号: - 追踪号: + 车体号: + 追踪号: - - + + + + + + + + + 实际的DID + + + + + + 被请求的DID + + + + + + + DID浏览选项 - - 实际的DID - - - - - - 被请求的DID - - - - - - DID浏览选项 - - - - + +
{{ item.name }}
+ + + 确定 @@ -65,7 +72,15 @@ export default { data() { return { trainNoList: [], - selected: null, + selected: null, + optionList: [ + { name: '0001 北客站一韦曲南站 往返运营', id: 1 }, + { name: '0002 北客站一韦曲南站 北客站站前折返 往返运营', id: 2 }, + { name: '0003 北客站一韦曲南站 韦曲南站站前折返 往返运营', id: 3 }, + { name: '0004 北客站一韦曲南站 北客站和韦曲南站均站前折返 往返运营', id: 4 }, + { name: '0005 北客站一会展中心 往返运营', id: 5 }, + { name: '0006 北客站一会展中心 北客站站前折返 往返运营', id: 6 } + ], addModel: { stationName: '', trainWindowCode: '', @@ -174,9 +189,14 @@ export default { }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 2ecae142a..f357f763a 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -286,11 +286,11 @@ export default { // 排列进路 arrangementRoute() { let step = ''; - let routeCode = ''; + let routeCode = ''; if (this.selected.isTerminalSignal) { const endSignalRouteList = this.$store.state.menuOperation.endSignalRouteList; endSignalRouteList.forEach(item => { - if (item.endSignalCode === this.selected.code) { + if (item.endButtonSignalCode === this.selected.code) { routeCode = item.routeCode; } }); @@ -313,14 +313,14 @@ export default { this.resetRouteSignal(); const updateDeviceList = []; updateDeviceList.push({code: this.selected.code, _type: 'Signal', isStartSignal: 1}); - const endSignalRouteList = []; + const endSignalRouteList = []; this.routeList.forEach(item => { if (item.startSignalCode === this.selected.code) { - endSignalRouteList.push({endSignalCode: item.endSignalCode, routeCode: item.code}); - updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 1}); + endSignalRouteList.push({endButtonSignalCode: item.endButtonSignalCode, routeCode: item.code}); + updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 1}); } }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); this.$store.dispatch('training/updateMapState', updateDeviceList); } this.$store.dispatch('training/nextNew', step).then(({ valid }) => { @@ -525,9 +525,9 @@ export default { updateDeviceList.push({code: startSignalCode, _type: 'Signal', isStartSignal: 0}); } endSignalRouteList.forEach(item => { - updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 0}); + updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 0}); }); - this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); + this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); this.$store.dispatch('training/updateMapState', updateDeviceList); }, enabledConfirm() { diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 64a975dd5..7b608f3b8 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -71,8 +71,8 @@ export default { children: [ { label: '目的地ID', - // handler: this.updateDestination, - handler: this.undeveloped, + handler: this.updateDestination, + // handler: this.undeveloped, cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE }, { diff --git a/src/store/modules/map.js b/src/store/modules/map.js index a6a0825a0..bf67f6a56 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -787,7 +787,7 @@ const map = { state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => { state.routeData[item.automaticRouteCode].automaticRouteCode = item.code; }); - state.routeList = routeDataList; + state.routeList = routeDataList; }, setOverlapData: (state, overlapList) => { state.overlapData = {}; diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js index 1f60d4daa..9fa064818 100644 --- a/src/utils/loaddata.js +++ b/src/utils/loaddata.js @@ -66,7 +66,7 @@ export function covertData(resp, resolve) { resolve(); }); }); - const routeData = resp.data.logicDataNew.routeList; // 设置进路数据 + const routeData = resp.data.logicDataNew.routeList; // 设置进路数据 const overlapData = resp.data.logicDataNew.overlapList; const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据 const signalApproachSectionData = resp.data.logicDataNew.signalApproachSectionList; // 信号机接近区段数据