From 074d4677fe864da0fe494ff0a0f4b14c627ccc17 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 7 Sep 2020 13:51:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/exam.js | 12 ++++++------ src/views/newMap/displayNew/exam/index.vue | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/store/modules/exam.js b/src/store/modules/exam.js index b9e4ce47c..989b6197c 100644 --- a/src/store/modules/exam.js +++ b/src/store/modules/exam.js @@ -74,15 +74,15 @@ const exam = { actions: { start({ commit }) { commit('setStarted', true); - commit('setSuspend', false); - commit('setUsedTime', 0); - commit('countUsedTime'); + // commit('setSuspend', false); + // commit('setUsedTime', 0); + // commit('countUsedTime'); }, over({ commit }) { commit('setStarted', false); - commit('setSuspend', true); - commit('setUsedTime', 0); - commit('stopCountTime'); + // commit('setSuspend', true); + // commit('setUsedTime', 0); + // commit('stopCountTime'); }, isOver() { const trainingList = store.getters['trainingList/trainingList']; diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue index 78d39abbf..c4853356e 100644 --- a/src/views/newMap/displayNew/exam/index.vue +++ b/src/views/newMap/displayNew/exam/index.vue @@ -98,6 +98,7 @@ export default { this.isDisable = true; startTrainingNew({ id: this.$route.query.trainingId }, this.group).then(response => { this.$store.dispatch('training/examModeStart'); + this.$store.dispatch('exam/start'); this.$store.dispatch('map/clearJlmapTrainView').then(() => { this.$store.dispatch('training/setMapDefaultState').then(() => { this.$store.dispatch('training/emitTipFresh'); @@ -117,7 +118,7 @@ export default { end() { if (this.$route.query.trainingId) { this.isDisable = false; - if (this.$store.state.training.started) { + if (this.$store.state.exam.started) { const model = { id: this.$route.query.examQuestionId, usedTime: this.$store.state.training.usedTime, @@ -125,6 +126,7 @@ export default { }; this.$store.dispatch('training/end', null); + this.$store.dispatch('exam/over'); finishOneExamQuestion(model).then(response => { this.$store.dispatch('training/setStopCountTime'); this.$store.dispatch('training/emitTipFresh'); From 7f434b28283855e2c3c67923b29a3dee5a8edebb Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 7 Sep 2020 14:04:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89?= =?UTF-8?q?=E4=BA=8C=E5=8F=B7=E7=BA=BF=E5=88=97=E8=BD=A6=E5=8F=B3=E9=94=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/xian_02/menus/dialog/trainDestination.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue index d74622dca..0e1f828af 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue @@ -50,7 +50,7 @@ -
{{ item.name }}-- {{ item.active }}
+
{{ item.name }}
 @@ -83,10 +83,10 @@ export default { selected: null, optionObject: {}, typeList: [ - { label: '往返运营（环路）', value: 'NORMAL_OPERATION' }, - { label: '末班运营（交路）', value: 'LAST_OPERATION' }, - { label: '非运营（交路）', value: 'NON_OPERATION' }, - { label: '末班非运营（交路）', value: 'LAST_NON_OPERATION' } + { label: '往返运营', value: 'NORMAL_OPERATION' }, + { label: '末班运营', value: 'LAST_OPERATION' }, + { label: '非运营', value: 'NON_OPERATION' }, + { label: '末班非运营', value: 'LAST_NON_OPERATION' } ], addModel: { groupNumber: '', From 7f07fe898b377fca967edd212d658986157a7878 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Mon, 7 Sep 2020 14:17:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/xian_02/menus/dialog/trainDestination.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue index 0e1f828af..0d66de4b9 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue @@ -95,6 +95,7 @@ export default { trainDestinationCode: '', operation: 'NORMAL_OPERATION' }, + trainDestinationCode: '', dialogShow: false, loading: false }; @@ -132,8 +133,9 @@ export default { if (!this.dialogShow) { this.addModel.groupNumber = selected.groupNumber; this.addModel.serviceNumber = selected.serviceNumber; - this.addModel.destinationCode = selected.destinationCode; + this.addModel.destinationCode = parseInt(selected.destinationCode) || selected.destinationCode; this.addModel.trainDestinationCode = ''; + this.trainDestinationCode = ''; } this.dialogShow = true; this.$nextTick(function () { @@ -167,6 +169,7 @@ export default { }); } item.active = true; + this.trainDestinationCode = item.code; }, commit() { const operate = { @@ -174,7 +177,7 @@ export default { operation: OperationEvent.Train.destinationTrainId.menu.operation, cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD, param: { - destinationCode: this.addModel.trainDestinationCode, + destinationCode: this.trainDestinationCode, serviceNumber: this.addModel.serviceNumber } }; @@ -188,7 +191,7 @@ export default { }).catch(() => { this.loading = false; this.doClose(); - this.$refs.noticeInfo.doShow(operate); + this.$refs.noticeInfo.doShow(); }); }, cancel() {