From aaf5912a2e2c88b71a7996105a9388c6691c2ec0 Mon Sep 17 00:00:00 2001 From: fan Date: Wed, 23 Nov 2022 18:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/sectionCmdControl.vue | 3 +- src/views/newMap/display/index.vue | 6 -- src/views/newMap/display/simulationMenu.vue | 26 +++++- src/views/newMap/display/terminals/index.vue | 9 -- .../newMap/display/terminals/terminalMenu.vue | 21 ++--- .../trainingDesign/createDraftTraining.vue | 6 +- .../display/trainingDesign/designPane.vue | 92 ++++++++++++------- .../display/trainingList/scenePlayRole.vue | 3 +- .../display/trainingList/trainingMenu.vue | 5 - 9 files changed, 96 insertions(+), 75 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue index b9ab69a17..4359e0246 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue @@ -343,8 +343,7 @@ export default { } else { this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') }); } - }).catch((error) => { - console.log(error, '====='); + }).catch(() => { this.timeCountCommand = -1; this.timeCountConfirm = -1; this.setButtonEnable({ step: -1 }); diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue index e91ad1fd0..31bf01166 100644 --- a/src/views/newMap/display/index.vue +++ b/src/views/newMap/display/index.vue @@ -26,14 +26,8 @@ export default { }, data() { return { - // offset: 15, - // offsetBottom: 15, - // tipBottom: 0, - // textStatusHeight: 0, - // planRunning:false, dataError: false, group: '' - // showMap: false }; }, computed:{ diff --git a/src/views/newMap/display/simulationMenu.vue b/src/views/newMap/display/simulationMenu.vue index 4c4b38fc3..5809cc75f 100644 --- a/src/views/newMap/display/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu.vue @@ -432,6 +432,21 @@ export default { isShow: true } ], + allMenuList1: [ + { label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isShow: () => { return true; } }, + { label: '修改系统时间', name: 'modifyOrDriving', click: this.modifyOrDriving, isShow: () => { return true; } }, + { label: '按计划行车', name: 'modifyOrDriving', click: this.modifyOrDriving, isShow: () => { return true; } }, + { label: '初始化', name: 'initialize', click: this.end, isShow: () => { return true; } }, + { label: '考试', name: 'exam', click: this.goExam, isShow: () => { return true; } }, + { label: '联系方式', name: 'contectUs', click: this.contectUs, isShow: () => { return true; } }, + { label: '成员管理', name: 'memberManage', click: this.memberManage, isShow: () => { return true; } }, + { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isShow: () => { return true; } }, + { label: '退出', name: 'quit', click: this.back, isShow: () => { return true; } }, + { label: '返回', name: 'back', click: this.back, isShow: () => { return true; } }, + { label: '留言板', name: 'messageBoard', click: this.messageBoard, isShow: () => { return true; } }, + { label: '路票', name: 'trainTicket ', click: this.trainTicket, isShow: () => { return true; }}, + { label: '簿册', name: 'registerBook ', click: this.registerBook, isShow: () => { return true; }} + ], deviceif: false, deviceShow: true, prdTypeMap: { @@ -693,8 +708,14 @@ export default { }); } } else { - history.go(-1); - Notification.closeAll(); + this.$confirm('是否退出仿真？', '提 示', { + confirmButtonText: '确 定', + cancelButtonText: '取 消', + type: 'warning' + }).then(() => { + history.go(-1); + Notification.closeAll(); + }); } }, // 数字沙盘 @@ -772,7 +793,6 @@ export default { // 实操练习 fieldPractice() { this.hideMenuList(); - this.$refs.sceneList.doShow(); }, // 理论考试 theoryQuiz() { diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index e9b6e6f04..7fbbc89be 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -119,7 +119,6 @@ export default { } }, '$store.state.socket.memberChangeCount': function () { // 仿真成员变更 - console.log('************'); this.initMemberUserInfo(); }, '$store.state.map.map': function (map) { @@ -185,12 +184,6 @@ export default { creatSubscribe(getTopic(type, this.group), header, defaultCallback); break; } - // creatSubscribe(`${displayTopic}\/${this.group}`, header, defaultCallback); - // creatSubscribe(getTopic('STATE', this.group), header, stateCallback); - // if (this.picture === 'trafficTerminal') { - // creatSubscribe(getTopic('CTC', this.group), header, defaultCallback); - // } - // this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(getTopic('COMMON', this.group)); @@ -241,10 +234,8 @@ export default { this.loading = loading; if (loading) { this.$store.dispatch('app/animationsClose'); - // this.$refs.progressBar && this.$refs.progressBar.start(); } else { this.$store.dispatch('app/animationsClose'); - // this.$refs.progressBar && this.$refs.progressBar.end(true); } } } diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 6db2c6d01..9a618ca79 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -57,7 +57,6 @@ export default { roleList: ['STATION_SUPERVISOR'], click: this.changePictureShow }, - { name: '调度计划', code: 'schedulingPlan', @@ -165,11 +164,16 @@ export default { watch: { '$store.state.training.roles': function (val) { this.initTerminalList(); + const trainingDetail = this.$store.state.trainingNew.trainingDetail; if (this.isFirst && this.$route.query.client) { this.isFirst = false; } else { - this.isFirst = false; - this.initPictureShow(); + if (trainingDetail && trainingDetail.client) { + this.changePictureShow(trainingDetail.client); + } else { + this.isFirst = false; + this.initPictureShow(); + } } }, '$store.state.socket.simulationWorkParam': function (val) { @@ -206,12 +210,6 @@ export default { if (localWorkRoleList.includes(this.roles)) { this.changePictureShow('localWork'); } else if (this.roles === 'DISPATCHER') { - // if (this.$route.query.lineCode === '16') { - // this.changePictureShow('dispatcherManage'); - // this.$store.dispatch('app/animationsClose'); - // } else { - // this.changePictureShow('dispatchWork'); - // } this.changePictureShow('dispatchWork'); } else if (this.roles === 'MAINTAINER') { // 通号 @@ -235,10 +233,7 @@ export default { right: 0; top: 45%; width: 111px; - padding-left: 1px; - padding-top: 1px; - padding-bottom: 1px; - padding-right: 1px; + padding: 1px; background: #fff; border-radius: 5px 0 0 5px; z-index: 2000; diff --git a/src/views/newMap/display/trainingDesign/createDraftTraining.vue b/src/views/newMap/display/trainingDesign/createDraftTraining.vue index b6a52969f..eeb5138c9 100644 --- a/src/views/newMap/display/trainingDesign/createDraftTraining.vue +++ b/src/views/newMap/display/trainingDesign/createDraftTraining.vue @@ -47,7 +47,8 @@ export default { name: '', mapId: '', description:'', - type: '' + type: '', + client: '' }, inputVisible: false, inputValue: '', @@ -138,7 +139,8 @@ export default { name: '', mapId: this.$route.query.mapId, description:'', - type: '' + type: '', + client: '' }; this.tagForm.dynamicTags = []; } diff --git a/src/views/newMap/display/trainingDesign/designPane.vue b/src/views/newMap/display/trainingDesign/designPane.vue index f8ad195b2..743411fe2 100644 --- a/src/views/newMap/display/trainingDesign/designPane.vue +++ b/src/views/newMap/display/trainingDesign/designPane.vue @@ -39,8 +39,6 @@ 预览 - 保存 - 发布 重置 @@ -69,7 +67,11 @@
{{ mapLocationObj.scale || '' }}
实训步骤 - 新增步骤 +
+ 新增步骤 + + 保存 +