diff --git a/src/App.vue b/src/App.vue index 140e6bfeb..48b7c900a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -91,7 +91,8 @@ export default { }, subscribeMessage(res) { if (this.$refs.deomonTopic && !window.location.href.includes('trainroom')) { - if (getSessionStorage('project') != 'refereeJsxt' && getSessionStorage('project') != 'jsxt' && !(getSessionStorage('project').includes('design'))) { + // getSessionStorage('project') != 'refereeJsxt' && getSessionStorage('project') != 'jsxt' && + if (!(getSessionStorage('project').includes('design'))) { this.$refs.deomonTopic.doShow(res); } this.$store.dispatch('socket/setSimulationInvite'); diff --git a/src/api/competition.js b/src/api/competition.js index 248589fd9..070fe28a1 100644 --- a/src/api/competition.js +++ b/src/api/competition.js @@ -1,118 +1,5 @@ import request from '@/utils/request'; -/** 裁判退出仿真*/ -export function refereeExitSimulation(group) { - return request({ - url: `/api/v1/competition/room/${group}/refree`, - method: 'delete' - }); -} - -/** 参赛者创建演练房间 */ -export function participantCreatTrainingRoom(id, data) { - return request({ - url: `/api/v1/competition/${id}/room`, - method: 'post', - data: data - }); -} - -/** 查询用户是否已经报名该竞赛 */ -export function getIsSignUp(raceId, params = {}) { - return request({ - url: `/api/race/${raceId}/isSignUp`, - method: 'get', - params - }); -} - -/** 提交试卷 */ -export function postCompetitionTheory(data) { - return request({ - url: `/api/v1/competitionTheory/submit`, - method: 'post', - data - }); -} - -/** 查询竞赛报名人员详情 */ -export function getRaceUserById(raceId) { - return request({ - url: `/api/race/${raceId}/raceUser`, - method: 'get' - }); -} - -/** 查询加载的实操题 */ -export function getPracticalQuestion(competitionId) { - return request({ - url: `/api/v1/competitionPractical/competition/${competitionId}`, - method: 'get' - }); -} - -/** 查询加载的理论题 */ -export function getTheoryQuestion(competitionId) { - return request({ - url: `/api/v1/competitionTheory/competition/${competitionId}`, - method: 'get' - }); -} - -/** 查询理论题作答详情 */ -export function getCompetitionDetail(competitionId) { - return request({ - url: `/api/v1/competitionTheory/detail/competition/${competitionId}`, - method: 'get' - }); -} - -/** 根据id查询竞赛信息 */ -export function getRaceById(id) { - return request({ - url: `/api/race/${id}`, - method: 'get' - }); -} - -/** 退出当前赛场 */ -export function quitCurrentRace(id, params) { - return request({ - url: `/api/v1/competition/${id}/room`, - method: 'delete', - params - }); -} - -/** 查看加载的竞赛试题 */ -export function getTestPaperDatail(competitionId) { - return request({ - url: `/api/v1/competition/${competitionId}/testPaper`, - method: 'get' - }); -} -/** 提交实操结果 */ -export function submitPracticalCompetition(group, competitionId) { - return request({ - url: `/api/v1/competitionPractical/${group}/${competitionId}/finish`, - method: 'put' - }); -} -/** 开始实操竞赛 */ -export function startPracticalCompetition(group, competitionId) { - return request({ - url: `/api/v1/competitionPractical/${group}/${competitionId}/start`, - method: 'put' - }); -} -/** 查询实操考试结果 */ -export function getPracticalCompetitionResult(competitionId) { - return request({ - url: `/api/v1/competitionPractical/${competitionId}/result`, - method: 'get' - }); -} - // 以下drts项目使用 /** 项目获取试题列表 */ diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js index 280a8c200..072682745 100644 --- a/src/api/jmap/training.js +++ b/src/api/jmap/training.js @@ -1,37 +1,5 @@ import request from '@/utils/request'; -/** 发送步骤数据*/ -export function sendTrainingNextStep(data, group) { - return request({ - url: `/api/training/${data.trainingId}/nextStep`, - method: 'post', - data: data.operate, - params: { - group - } - }); -} -/** 查询实训列表 0*/ -export function pageQueryTraining(params) { - return request({ - url: `/api/training/pagedQuery`, - method: 'get', - params: params - }); -} -export function sendCommand(group, command) { - return request({ - url: `/api/training/deviceChange?group=${group}`, - method: 'put', - data: { - param: command.val, - type: command.type, - code: command.code, - operation: command.operation - } - }); -} - // 发送新的指令 export function sendCommandNew(group, commandDefinitionId, command) { return request({ 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/api/runplan.js b/src/api/runplan.js index 4d90b75de..9955f59d0 100644 --- a/src/api/runplan.js +++ b/src/api/runplan.js @@ -362,7 +362,7 @@ export function postDailyRunPlanLoadGenerate(id) { // 加载通用排班计划 export function postSchedulingCommonGenerate(mapId) { return request({ - url: `/api/scheduling/common/generate?mapId=${mapId}`, + url: `/api/v1/scheduling/generate/common?mapId=${mapId}`, method: 'post' }); } diff --git a/src/api/scheduling.js b/src/api/scheduling.js index 1de48c2f5..96f4a0265 100644 --- a/src/api/scheduling.js +++ b/src/api/scheduling.js @@ -1,12 +1,5 @@ import request from '@/utils/request'; -export function generateSchedulingAgain(group) { - return request({ - url: `/api/scheduling/${group}/rebuild`, - method: 'delete' - }); -} - /** 查询某天的派班计划 */ export function querySechedulingNew (group, params) { return request({ diff --git a/src/api/simulation.js b/src/api/simulation.js index bb59c7f2a..34df45ed3 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -31,14 +31,6 @@ export function deleteFailureRule(id) { }); } -/** 退出仿真系统*/ -export function runDiagramQuit(group) { - return request({ - url: `/api/simulation/${group}/quit`, - method: 'put' - }); -} - /** 实训系统（新版地图） */ export function trainingNotifyNew({ trainingId }) { return request({ @@ -57,7 +49,7 @@ export function examNotifyNew({ examId }) { /** 获取用户实训列表*/ export function getSimulationList(data) { return request({ - url: `/api/simulation/stats`, + url: `/api/stats/simulation`, method: 'get', params: data }); @@ -66,7 +58,7 @@ export function getSimulationList(data) { /** 添加用户仿真数据*/ export function postSimulationStats(data) { return request({ - url: `/api/simulation/stats`, + url: `/api/stats/simulation`, method: 'post', data: data }); @@ -75,7 +67,7 @@ export function postSimulationStats(data) { /** 更新用户仿真数据*/ export function putSimulationStats(data) { return request({ - url: `/api/simulation/${data.id}/stats`, + url: `/api/stats/${data.id}`, method: 'put', data: data }); @@ -84,7 +76,7 @@ export function putSimulationStats(data) { /** 删除用户仿真数据*/ export function deleteSimulationStats(statsId) { return request({ - url: `/api/simulation/${statsId}`, + url: `/api/stats/${statsId}`, method: 'delete' }); } @@ -236,14 +228,6 @@ export function handlerIbpEvent(group, button, stationCode) { }); } -/** 预览脚本仿真*/ -export function scriptDraftRecordNotify(scriptId) { - return request({ - url: `/api/simulation/scriptDraft/${scriptId}`, - method: 'get' - }); -} - /** 预览脚本仿真（新版）*/ export function scriptDraftRecordNotifyNew(scriptId) { 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/jlmap3d/edit/connect/newgetmodels.js b/src/jlmap3d/edit/connect/newgetmodels.js deleted file mode 100644 index 394cdd47e..000000000 --- a/src/jlmap3d/edit/connect/newgetmodels.js +++ /dev/null @@ -1,262 +0,0 @@ -//import request from '@/utils/request'; -import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js'; - -export function getmodels(data) { - let postmap = { - id:data.mapdata.id, - mapId:data.mapdata.mapId, - assets:"null", - sections:"null", - signals:"null", - trains:"null", - stands:"null", - switchs:"null" - }; - console.log(data.mapdata); - if(data.mapdata.sectionlist.sections== undefined){ - return postmap; - } - - - if(data == undefined){ - - return postmap; - }else{ - - let models = { - stationtexture:"0", - istexture:false, - assets:[], - }; - //资源 - let assets = []; - // for(let i=0;i 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/index.vue b/src/jmapNew/theme/beijing_01/menus/index.vue index e7e5cb502..385ea0189 100644 --- a/src/jmapNew/theme/beijing_01/menus/index.vue +++ b/src/jmapNew/theme/beijing_01/menus/index.vue @@ -1,6 +1,5 @@