From e4ec3dfbde185b3c184aa012bbd89d1015376a98 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 10 Jun 2020 11:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=9B=E5=B1=B1=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=20=E7=AB=99=E5=8F=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Train/EMouse.js | 2 +- .../foshan_01/menus/dialog/standRunLevel.vue | 26 ++++++++------- .../foshan_01/menus/dialog/standStopTime.vue | 33 +++++++++---------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js index c65a5515d..a040e371b 100644 --- a/src/jmapNew/shape/Train/EMouse.js +++ b/src/jmapNew/shape/Train/EMouse.js @@ -39,7 +39,7 @@ class EMouse extends Group { if (Vue.prototype.$jlmap.lineCode == '11' || Vue.prototype.$jlmap.lineCode == '10') { text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.parentName : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: CTC车\n最高信号系统控制: CTC\n驾驶模式: SM模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`; } else { - text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`; + text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`; } } const trainTip = this.device.style.Train.common.trainTip; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue index 4a53ffc85..a85029268 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/standRunLevel.vue @@ -188,12 +188,12 @@ export default { getLevelByTime(time) { const times = Object.keys(this.timeList).findIndex(key => { return this.timeList[key].findIndex(obj => { - return obj.value === time; + return obj.value == time; }) >= 0; }).toString(); return times == -1 ? '0' : times; }, - loadInitData(selected, opts) { + loadInitData(selected) { this.tempData = []; const index = this.stationList.findIndex(n => n.code == selected.stationCode); if (selected.direction == '01') { // 下行 @@ -201,18 +201,18 @@ export default { if (index != 0) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(opts.intervalRunTime), time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(selected.runLevelTime), time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } else { // 上行时，此站不是最后一站 if (index != this.stationList.length) { const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code); const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode); - this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(opts.intervalRunTime), time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus }); + this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: this.getLevelByTime(selected.runLevelTime), time: selected.runLevelTime ? selected.runLevelTime : 0, check: !!selected.runLevelTimeForever }); } } }, - doShow(operate, selected, opts) { + doShow(operate, selected) { this.selected = selected; // 如果不是断点激活窗口，而是第一次显示窗口时，需要初始化窗口数据 if (!this.dialogShow) { @@ -225,7 +225,7 @@ export default { this.stationName = station.name; } } - this.loadInitData(selected, opts); + this.loadInitData(selected); } this.dialogShow = true; @@ -249,10 +249,11 @@ export default { }, timeSelectChange(time) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.choose.operation + operation: OperationEvent.StationStand.setRunLevel.choose.operation, + val: this.time }; - this.time = time.toString(); + this.time = time; this.isSelect = false; this.isConfirm = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -263,7 +264,8 @@ export default { }, levelSelectChange(row) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.chooseLevel.operation + operation: OperationEvent.StationStand.setRunLevel.chooseLevel.operation, + val: row.level }; this.time = row.time = this.timeList[row.level][0].value; @@ -277,8 +279,10 @@ export default { }, checkChange(check) { const operate = { - operation: OperationEvent.StationStand.setRunLevel.check.operation + operation: OperationEvent.StationStand.setRunLevel.check.operation, + val: check }; + this.isConfirm = true; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { @@ -299,7 +303,7 @@ export default { operation: OperationEvent.StationStand.setRunLevel.menu.operation, cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME, param: { - runLevelTime: this.time, + runLevelTime: Number(this.time), runLevelTimeForever: !!this.tempData[0].check } }; diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue index 4a1abbde7..ee41c0aac 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue @@ -38,8 +38,8 @@ 有效次数
- 一次有效 - 一直有效 + 一次有效 + 一直有效
@@ -128,7 +128,7 @@ export default { }); }, methods: { - doShow(operate, selected, tempDate) { + doShow(operate, selected) { this.selected = selected || {}; // 如果不是断点激活，则需要对初始值进行初始化 if (!this.dialogShow) { @@ -142,11 +142,11 @@ export default { } } - this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02'; - this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime); - // this.effective = tempDate.parkingValidStatus ? true : false; - this.effective = tempDate.parkingValidStatus ? '1' : '0'; + this.control = Number(selected.parkingTime) == -1 ? '01' : '02'; + this.effective = selected.parkingAlwaysValid ? '1' : '0'; this.direction = selected.direction; + + this.time = Number(selected.parkingTime) == -1 ? 15 : Number(selected.parkingTime); } this.dialogShow = true; this.$nextTick(function () { @@ -162,12 +162,13 @@ export default { chooseControl(control) { /** 自动时的默认时间*/ if (control == '01') { - this.inputTime = 15; - this.effective = 1; + this.time = 15; + this.effective = '1'; } const operate = { - operation: OperationEvent.StationStand.setStopTime.choose1.operation + operation: OperationEvent.StationStand.setStopTime.choose1.operation, + val: this.control }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -178,7 +179,8 @@ export default { }, chooseEffective() { const operate = { - operation: OperationEvent.StationStand.setStopTime.choose2.operation + operation: OperationEvent.StationStand.setStopTime.choose2.operation, + val: this.effective }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -190,7 +192,8 @@ export default { inputTime() { const operate = { repeat: true, - operation: OperationEvent.StationStand.setStopTime.input.operation + operation: OperationEvent.StationStand.setStopTime.input.operation, + val: this.time }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { @@ -205,11 +208,9 @@ export default { operation: OperationEvent.StationStand.setStopTime.menu.operation, cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME, param: { - parkingTime: this.control == '01' ? -1 : 1, - runLevelTime: this.time, + parkingTime: this.control == '01' ? -1 : this.time, parkingAlwaysValid: this.effective == '1' } - // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`] }; this.loading = true; @@ -217,8 +218,6 @@ export default { this.loading = false; if (valid) { this.doClose(); - // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - // this.$refs.confirmControl.doShow(operate); } }).catch((error) => { this.loading = false;