diff --git a/src/api/management/user.js b/src/api/management/user.js index 910e2113f..ed32b4ef5 100644 --- a/src/api/management/user.js +++ b/src/api/management/user.js @@ -137,13 +137,6 @@ export function getUserinfoPassword(id, data) { }); } -// 获取当前用户数量 -export function getOnlineNmuber() { - return request({ - url: `/api/cache/onlineUser`, - method: 'get' - }); -} // 生成线下环境用户 export function generateOfflineUser(data) { return request({ diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue index 6c1771078..44b96de50 100644 --- a/src/components/QuillEditor/index.vue +++ b/src/components/QuillEditor/index.vue @@ -188,6 +188,20 @@ export default { }, mounted() { this.content = this.value; + const that = this; + document.addEventListener('click', (e) => { + const emojiElem = document.getElementById('emoji-palette'); + const emojiButtonList = document.getElementsByClassName('ql-emoji'); + let flag = true; + for (let i = 0; i < emojiButtonList.length; i++) { + if (emojiButtonList[i].contains(e.target)) { + flag = false; + } + } + if (emojiElem && !emojiElem.contains(e.target) && flag) { + that.closeEmoji(); + } + }); }, methods: { onChange(e) { @@ -209,6 +223,11 @@ export default { }, setContents(val) { this.$refs.editor.quill.setContents(val); + }, + closeEmoji() { + const ele_emoji_plate = document.getElementById('emoji-palette'); + document.getElementById('emoji-close-div').style.display = 'none'; + if (ele_emoji_plate) { ele_emoji_plate.remove(); } } } }; @@ -226,6 +245,20 @@ export default { left: -30px; } } + /deep/ #emoji-palette{ + top: -215 !important; + left: 0 !important; + max-width: 550px; + width: 550px; + #tab-toolbar{ text-align: left} + } + } + /deep/ #emoji-palette{ + top: -215px !important; + left: 850px !important; + max-width: 550px; + width: 550px; + #tab-toolbar{ text-align: left} + #tab-panel{ height:175px} } - diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js index db8739e34..40cc992db 100644 --- a/src/jmapNew/config/skinCode/fuzhou_01.js +++ b/src/jmapNew/config/skinCode/fuzhou_01.js @@ -646,7 +646,7 @@ class SkinCode extends defaultStyle { trainHeadArrowOffsetX: 2 // 列车车头三角偏移 }, common: { - trainHeight: 17, // 列车高度 + trainHeight: 10, // 列车高度 trainHeadDistance: 2, // 列车和车头之间的间距 trainWidth: 76, // 列车长度 trainTextFontSize: 10, // 列车字号 diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js index 7d691aff3..5bd62e07f 100644 --- a/src/jmapNew/constant/deviceState.js +++ b/src/jmapNew/constant/deviceState.js @@ -125,7 +125,7 @@ deviceState[deviceType.StationStand] = { assignSkip: 0, // 是否指定跳停 runLevelTime: 0, // 区间运行时间 自动为 0 parkingTime: 0, // 站台停车时间 自动为0 - + num:0, // 站台上等车人数 // /** 折返策略*/ // reentryStrategy: { // Default: '01', /** 默认（缺省值）*/ @@ -246,7 +246,9 @@ deviceState[deviceType.Train] = { /** 列车精确位置 （成都一号线使用）*/ offsetp:0, /** 列车所在物理区段 */ - physicalCode:'' + physicalCode:'', + /** 列车上的人数 */ + num:0 }; diff --git a/src/jmapNew/constant/stateTransition.js b/src/jmapNew/constant/stateTransition.js index f1eb0a87e..b547903e0 100644 --- a/src/jmapNew/constant/stateTransition.js +++ b/src/jmapNew/constant/stateTransition.js @@ -24,7 +24,8 @@ class Status { assignSkip: device.assignSkip, // 是否指定跳停 runLevelTime: device.runLevelTime, // 区间运行时间 自动为 0 parkingTime: device.parkingTime, // 站台停车时间 自动为0 - fault: device.fault /** 非故障*/ + fault: device.fault, /** 非故障*/ + num:device.num }; } handleSection(device) { @@ -94,7 +95,8 @@ class Status { jump: device.jump, /** 是否跳停 */ hold: device.hold, /** 是否扣车 */ offsetp:device.offsetp, /** 列车精确位置 （成都一号线使用）*/ - physicalCode:device.physicalCode /** 列车所在物理区段 */ + physicalCode:device.physicalCode, /** 列车所在物理区段 */ + num:device.num /** 列车上的人数*/ }; } handleStation(device) { diff --git a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js index 0d6d996ad..5e41f0463 100644 --- a/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/StationStand/safeStand/ESolidStand.js @@ -41,14 +41,34 @@ class ESolidStand extends Group { setState(model) { const style = this.model.style; - // 列车跳停 - model.assignSkip && this.setColor(style.StationStand.solidStand.designatedJumpStopColor); - // 全部跳停 - model.allSkip && this.setColor(style.StationStand.solidStand.jumpStopColor); - // 停车 - model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); - // 紧急停车 - model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor); + const path = window.location.href; + if (!path.includes('/practiceDisplay')) { + // 列车跳停 + model.assignSkip && this.setColor(style.StationStand.solidStand.designatedJumpStopColor); + // 全部跳停 + model.allSkip && this.setColor(style.StationStand.solidStand.jumpStopColor); + // 停车 + model.trainParking && this.setColor(style.StationStand.solidStand.stopColor); + // 紧急停车 + model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor); + } else { + this.handlePassagerColor(model.num); + } + } + + handlePassagerColor(num) { + if (num && num > 0) { + const passagerNum = parseInt(num); + if (passagerNum < 40) { + this.setColor('#29a909'); + } else if (passagerNum < 80 && passagerNum >= 40) { + this.setColor('#ffa500'); + } else { + this.setColor('#F00'); + } + } else { + this.setColor('#29a909'); + } } } diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js index 91b623f9c..c02ba9aac 100644 --- a/src/jmapNew/shape/Train/EMouse.js +++ b/src/jmapNew/shape/Train/EMouse.js @@ -47,12 +47,12 @@ class EMouse extends Group { direction = this.device.model.right != 1; } if (LangStorage.getLang() == 'en') { - text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`; + text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m\nNumber of people: ${this.device.model.num ? this.device.model.num : 0}`; } else { 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 ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\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${this.device.model.num ? '\n车内人数: ' + this.device.model.num : ''}`; } } const trainTip = this.device.style.Train.common.trainTip; diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js index 1b5a6e889..01daaeeda 100644 --- a/src/jmapNew/shape/Train/TrainBody.js +++ b/src/jmapNew/shape/Train/TrainBody.js @@ -289,7 +289,8 @@ export default class TrainBody extends Group { this.deviceModel.down = false; } setTrainColor(color) { - this.trainBodyBox && this.trainBodyBox.setStyle('fill', color); + this.trainBodyBox && this.trainBodyBox.setColor('fill', color); + // Style('fill', color); } setHShow(isShow) { if (this.textH) { diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index faa2404aa..96588e9a9 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -84,6 +84,7 @@ export default class Train extends Group { hold:model.hold, jump:model.jump, stop:model.stop, + num:model.num, dt: model.dt, driveMode: model.driveMode, model: model @@ -335,24 +336,36 @@ export default class Train extends Group { const flag = model.trainWindowModel ? model.trainWindowModel.reversal : false; if (model) { this.recover(); - if (this.style.Train.common.trainHeadColorChangeMode) { - this.setDriveMode(model.driveMode + model.runLevel); - } else { - this.setDriveMode(model.driveMode); - } + // if (this.style.Train.common.trainHeadColorChangeMode) { + // this.setDriveMode(model.driveMode + model.runLevel); + // } else { + // this.setDriveMode(model.driveMode); + // } this.setRunStatus(model.stop, flag); - this.setCommunicationStatus(model.runLevel); + const path = window.location.href; + if (!path.includes('/practiceDisplay')) { + if (this.style.Train.common.trainHeadColorChangeMode) { + this.setDriveMode(model.driveMode + model.runLevel); + } else { + this.setDriveMode(model.driveMode); + } + this.setCommunicationStatus(model.runLevel); + this.setSoonerOrLater(model.dt); + } this.setDoorStatus(model.doorCloseLock); this.setAlarmStatus(model.alarmStatus); this.setHoldStatus(model.hold); this.setJumpStatus(model.jump); - this.setSoonerOrLater(model.dt); + // this.setSoonerOrLater(model.dt); this.setTrainTypeColor(model.type); this.setPlanRoutingTypeColor(model.planRoutingType); const style = this.style; if (style.Section.trainPosition.display) { this.updateSection(object); } + if (path.includes('/practiceDisplay')) { + this.handlePassagerColor(model.num); + } } } setTrainTypeColor(type) { @@ -365,6 +378,31 @@ export default class Train extends Group { this.trainB && this.trainB.removeTrainDetail(); } + handlePassagerColor(num) { + if (num) { + // && num > 0 + const passagerNum = parseInt(num); + if (passagerNum < 100) { + this.trainB && this.trainB.setTrainColor('#29a909'); + this.trainL && this.trainL.setColor('#29a909'); + this.trainR && this.trainR.setColor('#29a909'); + } else if (passagerNum < 200 && passagerNum >= 100) { + this.trainB && this.trainB.setTrainColor('#ffa500'); + this.trainL && this.trainL.setColor('#ffa500'); + this.trainR && this.trainR.setColor('#ffa500'); + } else { + this.trainB && this.trainB.setTrainColor('#F00'); + this.trainL && this.trainL.setColor('#F00'); + this.trainR && this.trainR.setColor('#F00'); + } + } else { + this.trainB && this.trainB.setTrainColor('#29a909'); + this.trainL && this.trainL.setColor('#29a909'); + this.trainR && this.trainR.setColor('#29a909'); + } + + } + getBoundingRect() { const list = [this.trainB, this.trainL, this.trainR]; let rect = null; diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue index 50c7654c3..36dde26f3 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue @@ -407,8 +407,9 @@ export default { [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]); } }).catch((error) => { + console.error(error); this.loading = false; - this.$refs.noticeInfo.doShow(operate, error.message); + this.$refs.noticeInfo.doShow(); }); } else { if (this.model.stationName != this.model.confirmStationName) { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue index c0d8a595d..933358c25 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue @@ -121,7 +121,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate, [error.message]); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue index b3e620c49..c9d98ae1b 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue @@ -149,7 +149,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue index db2edcba8..bb8ad7975 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue @@ -178,7 +178,7 @@ export default { } }).catch(() => { this.loading = false; - this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue index f490d7217..d2c070fe9 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue @@ -196,7 +196,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } else { this.doClose(); diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue index 22f8fffb7..b50856978 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue @@ -100,7 +100,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue index 0c82bf292..a8ba37275 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue @@ -119,7 +119,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue index 7fa0902dd..f45041431 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue @@ -148,7 +148,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue index 82f527d75..a10f88bff 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue @@ -146,7 +146,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue index 7056f38c9..3b727f964 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue @@ -148,7 +148,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue index 4f6e1e1b5..1fd9ff241 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue @@ -127,7 +127,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue index 6af5ec33b..2715ee2f5 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue @@ -148,7 +148,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue index 8de31e986..a0c71a088 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue @@ -148,7 +148,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue index 9a2f1402a..0cab4491a 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue @@ -130,7 +130,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue index fe7c0dbbd..c5ba1000e 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue @@ -132,7 +132,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index d8c2e523d..a9193ac73 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -356,7 +356,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, selectedChange() { @@ -384,7 +384,7 @@ export default { this.$refs.password.doShow(operate); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } @@ -407,7 +407,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } break; @@ -429,7 +429,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } break; diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue index fdffaa58b..e745a6a60 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue @@ -124,7 +124,8 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue index 2fc0b1930..9cee0da30 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue @@ -151,7 +151,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, @@ -175,7 +175,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue index 58373b59e..dc8f6d07a 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue @@ -151,7 +151,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, @@ -175,7 +175,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue index 9c2ab1ec8..07a561fbb 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue @@ -135,13 +135,11 @@ export default { this.loading = false; if (valid) { this.doClose(); - } else { - // this.$refs.noticeInfo.doShow(operate); } }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue index dd2710c1a..11d8314b8 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue @@ -118,8 +118,6 @@ export default { this.loading = false; if (valid) { this.doClose(); - } else { - // this.$refs.noticeInfo.doShow(operate); } }).catch(() => { this.loading = false; diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue index fe78e420f..e1f85a291 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue @@ -135,13 +135,10 @@ export default { this.loading = false; if (valid) { this.doClose(); - } else { - // this.$refs.noticeInfo.doShow(operate); } }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); }); } else { return false; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index a5f771733..a0ce7902d 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -180,7 +180,7 @@ export default { if (selectType.fault) { this.faultUnlock(selectType); } else { - this.$refs.noticeInfo.doShow({}, `该区段[${selectType.name}(${selectType.code})]没有故障`); + this.$refs.noticeInfo.doShow(`该区段[${selectType.name}(${selectType.code})]没有故障`); } break; } diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index 8b63b780d..dbe384e3f 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -207,7 +207,7 @@ export default { if (route) { this.setRoute(route); } else { - this.$refs.noticeInfo.doShow({}, `没有以[${this.oldSelected.name}(${this.oldSelected.code})]为始端信号机，以[${selectType.name}(${selectType.code})] 为终端信号机的进路`); + this.$refs.noticeInfo.doShow(`没有以[${this.oldSelected.name}(${this.oldSelected.code})]为始端信号机，以[${selectType.name}(${selectType.code})] 为终端信号机的进路`); } this.clickNum = 0; } else { @@ -244,7 +244,7 @@ export default { case OperationEvent.Signal.reopenSignal.button.operation: { // 信号重开 if (selectType.greenOpen) { - this.$refs.noticeInfo.doShow({}, `信号机[${selectType.name}(${selectType.code})]已开启，无需重开信号机`); + this.$refs.noticeInfo.doShow(`信号机[${selectType.name}(${selectType.code})]已开启，无需重开信号机`); } else { // 开放进路信号机因故关闭 this.reopenSignalByRoute(selectType); @@ -266,7 +266,7 @@ export default { } } else { - this.$refs.noticeInfo.doShow({}, `信号机[${selectType.name}(${selectType.code})]没有已锁闭进路，不能设置联锁自动进路`); + this.$refs.noticeInfo.doShow(`信号机[${selectType.name}(${selectType.code})]没有已锁闭进路，不能设置联锁自动进路`); } break; } @@ -313,7 +313,8 @@ export default { setRoute(route) { commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:route.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 取消进路 @@ -328,7 +329,8 @@ export default { cancelTrainRouteByLow(selectType) { commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 现地总人解 @@ -344,7 +346,8 @@ export default { reopenSignalByRoute(selectType) { commitOperate(menuOperate.Signal.reopenSignal, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 信号重开 @@ -367,7 +370,8 @@ export default { signalCloseByLow(selectType) { commitOperate(menuOperate.Signal.signalClose, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 进路交人工控 @@ -390,14 +394,16 @@ export default { singalPassModel(selectType) { commitOperate(menuOperate.Signal.setAutoInterlock, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 取消通过模式 singalCancelPassModel(selectType) { commitOperate(menuOperate.Signal.cancelAutoInterlock, {signalCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 查询进路状态 diff --git a/src/jmapNew/theme/beijing_01/menus/menuStation.vue b/src/jmapNew/theme/beijing_01/menus/menuStation.vue index 8cfcd8e98..6df4d386c 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStation.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStation.vue @@ -198,7 +198,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 全站取消联锁自动触发 @@ -214,7 +214,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 上电解锁 diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue index dc075462a..2bb9780da 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue @@ -223,14 +223,16 @@ export default { setDetainTrainByLow(selectType) { commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, /** 取消扣车 */ cancleDetainTrainByLow(selectType) { commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 设置扣车 diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index bd29fecd4..d9f53a6aa 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -226,7 +226,8 @@ export default { lock(selectType) { commitOperate(menuOperate.Switch.lock, {switchCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 道岔解锁 @@ -236,7 +237,8 @@ export default { this.$refs.switchControl.doShow(operate, selectType); } }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 现地道岔强扳 @@ -247,21 +249,24 @@ export default { } }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 单操到定位 locate(selectType) { commitOperate(menuOperate.Switch.locate, {switchCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 单操到反位 reverse(selectType) { commitOperate(menuOperate.Switch.reverse, {switchCode:selectType.code}, 3).then(({valid, operate})=>{ }).catch(error=>{ - this.$refs.noticeInfo.doShow({}, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 区段切除 diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index 71d502bdf..5ab50ebd2 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -330,10 +330,6 @@ export default { }); }, nextStation() { - // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ - // }).catch((error) => { - // this.$refs.noticeInfo.doShow(error.message); - // }); const group = this.$route.query.group; const param = { commandType: 'Drive_Ahead', @@ -342,14 +338,11 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, routeBlockRun() { - // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ - // }).catch((error) => { - // this.$refs.noticeInfo.doShow(error.message); - // }); const group = this.$route.query.group; const param = { commandType: 'Route_Block_Drive', @@ -358,7 +351,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { @@ -370,7 +364,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { @@ -382,7 +377,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 限速行驶 @@ -397,10 +393,10 @@ export default { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, undeveloped() { diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue index 5af70c2e9..1b38066e7 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue @@ -226,12 +226,12 @@ export default { // if (valid) { // this.doClose(); // } else { - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // } // }).catch(error => { // this.loading = false; // this.doClose(); - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // }); // } else { // return false; diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue index 96ca967de..53f00e838 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -152,12 +152,12 @@ export default { // if (valid) { // this.doClose(); // } else { - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); // } // }).catch(() => { // this.loading = false; // this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); // }); // } else { // return false; diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue index ae01ad2fa..c99d54e3b 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue @@ -226,12 +226,12 @@ export default { // if (valid) { // this.doClose(); // } else { - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // } // }).catch(error => { // this.loading = false; // this.doClose(); - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // }); // } else { // return false; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue index af73fca24..2a910aeed 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue @@ -129,7 +129,7 @@ export default { } }, 1000).catch(() => { this.loading = true; - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue index 27134db34..6277e229c 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue @@ -123,7 +123,6 @@ export default { }).catch(() => { this.loading = false; // this.doClose(); - // this.$refs.noticeInfo.doShow(operate); }); } } diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 25ed5c2c2..4b1299066 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -186,10 +186,10 @@ export default { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } else { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); } }).catch(() => { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); }); }, // 设置故障 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index a69e68393..0794061eb 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -258,7 +258,7 @@ export default { this.$refs.routeControl.doShow(step, this.selected); } }).catch(() => { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); }); }, // 设置故障 @@ -311,7 +311,7 @@ export default { }); } }).catch(() => { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); }); }, checkRoutes(routes) { @@ -377,7 +377,7 @@ export default { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁', cmdType:CMD.Signal.CMD_SIGNAL_BLOCK}}); } }).catch(() => { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); }); }, // 信号解封 diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue index 377dab1fc..b9fe4f103 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue @@ -142,12 +142,12 @@ export default { // if (valid) { // this.doClose(); // } else { - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // } // }).catch(error => { // this.loading = false; // this.doClose(); - // // this.$refs.noticeInfo.doShow(operate); + // // this.$refs.noticeInfo.doShow(); // }); // } else { // return false; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index cf99d29d7..80b27dea2 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -217,7 +217,7 @@ export default { } }).catch(() => { - this.$refs.noticeInfo.doShow(step); + this.$refs.noticeInfo.doShow(); }); }, triggerFaultManagement() { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index f44a19b00..c74ce85ec 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -240,10 +240,6 @@ export default { }); }, nextStation() { - // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ - // }).catch((error) => { - // this.$refs.noticeInfo.doShow(error.message); - // }); const group = this.$route.query.group; const param = { commandType: 'Drive_Ahead', @@ -252,14 +248,11 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, routeBlockRun() { - // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ - // }).catch((error) => { - // this.$refs.noticeInfo.doShow(error.message); - // }); const group = this.$route.query.group; const param = { commandType: 'Route_Block_Drive', @@ -268,7 +261,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handleOverFuideSignal() { @@ -280,7 +274,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handleOverEedLight() { @@ -292,7 +287,8 @@ export default { }; commitTrainSend(group, param).then(({valid, operate})=>{ }).catch((error) => { - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 限速行驶 @@ -308,10 +304,10 @@ export default { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }).catch(() => { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, // 设计划车 @@ -327,7 +323,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$refs.trainControl.doShow(operate, this.selected); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }); }, @@ -344,7 +340,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$refs.trainControl.doShow(operate, this.selected); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }); }, @@ -361,7 +357,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$refs.trainControl.doShow(operate, this.selected); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }); }, @@ -378,7 +374,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$refs.trainDetailInfo.doShow(operate, this.selected); } else { - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }); }, diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue index ad3292f4d..44c1830df 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue @@ -117,7 +117,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate, [error.message]); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue index 2ae02bf7d..49c978693 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue @@ -149,7 +149,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue index cae26d61e..a88a79d8f 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue @@ -183,7 +183,7 @@ export default { } }).catch(() => { this.loading = false; - this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue index d2c1a4167..fd86eafca 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue @@ -180,7 +180,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue index 4b28749fa..319b543d3 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue @@ -232,12 +232,12 @@ export default { this.doClose(); } else { this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); } }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } }, diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue index fcb1f19b4..47280b180 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue @@ -238,7 +238,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, // 进路交自动控 @@ -250,7 +251,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue index 2c2837ece..cc9bc606f 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue @@ -271,7 +271,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } }, @@ -285,7 +286,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue index 49536e4bb..517b12677 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue @@ -567,7 +567,8 @@ export default { }).catch((error) => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue index e3e576079..79f4428cc 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue @@ -257,7 +257,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; @@ -281,7 +281,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; @@ -305,7 +305,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue index e6efdb40c..69abacf79 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue @@ -117,7 +117,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() { diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue index c8b0f6b2b..06fac788e 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue @@ -148,7 +148,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue index 139fb7305..660f14eea 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue @@ -131,7 +131,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue index 255b57c7d..0b330341c 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue @@ -143,7 +143,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue index 93af27490..78305ab05 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue @@ -171,7 +171,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue index 531534921..4c1f8d95c 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue @@ -160,7 +160,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + // this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue index 1f5a03706..a3b31ed95 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue @@ -179,7 +179,8 @@ export default { }).catch(error => { this.loading = false; this.doClose(); - // this.$refs.noticeInfo.doShow(operate); + console.error(error); + // this.$refs.noticeInfo.doShow(); }); } else { return false; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index e2f279fb4..5f997ff10 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -238,7 +238,8 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, resetPosition() { @@ -356,11 +357,12 @@ export default { }); if (!flag) { this.deviceList = []; - this.$refs.noticeInfo.doShow(operate, '未找到选择进路！'); + this.$refs.noticeInfo.doShow('未找到选择进路！'); } } }, handelFunctionButton(model, subType) { + debugger; const operate = { over: true, operation: this.$store.state.menuOperation.buttonOperation, @@ -391,14 +393,15 @@ export default { operate.param = {stationCodes: [model.code]}; break; case 'emergency': - operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL; + operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL; operate.param = {stationCodes: [model.code]}; break; } } this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => { this.deviceList = []; - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handelTotalCancel(model, subType) { @@ -435,7 +438,8 @@ export default { } this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => { this.deviceList = []; - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handleGuideRoute(deviceList) { @@ -458,7 +462,8 @@ export default { this.$refs.password.doShow(operate); } }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } else { const operate = { @@ -476,7 +481,8 @@ export default { this.$refs.password.doShow(operate); } }).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } } else if (deviceList.length === 2) { @@ -494,13 +500,14 @@ export default { this.deviceList = []; flag = true; this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + this.$refs.noticeInfo.doShow(); + console.error(error); }); } }); if (!flag) { this.deviceList = []; - this.$refs.noticeInfo.doShow(operate, '未找到选择进路！'); + this.$refs.noticeInfo.doShow('未找到选择进路！'); } } }, @@ -519,7 +526,8 @@ export default { operate.param = {signalCode: model.code}; this.deviceList = []; this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); } }, @@ -540,7 +548,8 @@ export default { operate.param = {signalCode: model.code, routeCodeList: routeCodeList}; this.deviceList = []; this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handelSwitchOperate(model) { @@ -552,7 +561,8 @@ export default { param: { switchCode: model.code} }; this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handelBlockOrUnblock(model) { @@ -578,7 +588,8 @@ export default { operate.param = {signalCode: model.code}; } this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handelGuideLock(model) { @@ -595,7 +606,8 @@ export default { operate.cmdType = CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK; } this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, handelFaultSection(model) { @@ -607,7 +619,8 @@ export default { param: {sectionCode: model.code} }; this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => { - this.$refs.noticeInfo.doShow(operate, error.message); + console.error(error); + this.$refs.noticeInfo.doShow(); }); }, selectedChange() { diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue index b3564a6fe..1c4275935 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue @@ -129,7 +129,7 @@ export default { } }, 1000).catch(() => { this.loading = true; - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); } } diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue index 6b24b8ff6..2c111f513 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue @@ -1,127 +1,135 @@ diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue index d9ede725a..f3bda9b1d 100644 --- a/src/views/planMonitor/editTool/schedule.vue +++ b/src/views/planMonitor/editTool/schedule.vue @@ -28,7 +28,7 @@ import { mapGetters } from 'vuex'; import { timeFormat } from '@/utils/date'; import { getStationList, queryRunPlan } from '@/api/runplan'; import {getRpDetailByUserMapId, getUserMapDetailByMapId} from '@/api/designPlatform'; -import { loadMapDataById } from '@/utils/loaddata'; +// import { loadMapDataById } from '@/utils/loaddata'; import { getPublishMapInfo } from '@/api/jmap/map'; import {getMapDetail} from '@/api/jmap/mapdraft'; import DataTable from './menus/components/dataTable'; @@ -546,7 +546,6 @@ export default { } }); } - return series; }, popModels(series, models) { @@ -558,7 +557,6 @@ export default { } }); } - return series; }, loadInitChart() { diff --git a/src/views/system/news/index.vue b/src/views/system/news/index.vue index dffd4d46b..7290234fa 100644 --- a/src/views/system/news/index.vue +++ b/src/views/system/news/index.vue @@ -30,7 +30,6 @@