joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2020-09-07 16:03:03 +08:00
commit 878b62e494
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
View File

@ -50,7 +50,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="option_box"> <el-row class="option_box">
<div v-for="(item, index) in optionObject[addModel.operation]" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}-- {{ item.active }}</div> <div v-for="(item, index) in optionObject[addModel.operation]" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}</div>
</el-row> </el-row>
<el-row class="option_result_box" /> <el-row class="option_result_box" />
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
@ -83,10 +83,10 @@ export default {
selected: null, selected: null,
optionObject: {}, optionObject: {},
typeList: [ typeList: [
{ label: '往返运营（环路）', value: 'NORMAL_OPERATION' }, { label: '往返运营', value: 'NORMAL_OPERATION' },
{ label: '末班运营（交路）', value: 'LAST_OPERATION' }, { label: '末班运营', value: 'LAST_OPERATION' },
{ label: '非运营（交路）', value: 'NON_OPERATION' }, { label: '非运营', value: 'NON_OPERATION' },
{ label: '末班非运营（交路）', value: 'LAST_NON_OPERATION' } { label: '末班非运营', value: 'LAST_NON_OPERATION' }
], ],
addModel: { addModel: {
groupNumber: '', groupNumber: '',
@ -95,6 +95,7 @@ export default {
trainDestinationCode: '', trainDestinationCode: '',
operation: 'NORMAL_OPERATION' operation: 'NORMAL_OPERATION'
}, },
trainDestinationCode: '',
dialogShow: false, dialogShow: false,
loading: false loading: false
}; };
@ -132,8 +133,9 @@ export default {
if (!this.dialogShow) { if (!this.dialogShow) {
this.addModel.groupNumber = selected.groupNumber; this.addModel.groupNumber = selected.groupNumber;
this.addModel.serviceNumber = selected.serviceNumber; this.addModel.serviceNumber = selected.serviceNumber;
this.addModel.destinationCode = selected.destinationCode; this.addModel.destinationCode = parseInt(selected.destinationCode) || selected.destinationCode;
this.addModel.trainDestinationCode = ''; this.addModel.trainDestinationCode = '';
this.trainDestinationCode = '';
} }
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
@ -167,6 +169,7 @@ export default {
}); });
} }
item.active = true; item.active = true;
this.trainDestinationCode = item.code;
}, },
commit() { commit() {
const operate = { const operate = {
@ -174,7 +177,7 @@ export default {
operation: OperationEvent.Train.destinationTrainId.menu.operation, operation: OperationEvent.Train.destinationTrainId.menu.operation,
cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD, cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD,
param: { param: {
destinationCode: this.addModel.trainDestinationCode, destinationCode: this.trainDestinationCode,
serviceNumber: this.addModel.serviceNumber serviceNumber: this.addModel.serviceNumber
} }
}; };
@ -188,7 +191,7 @@ export default {
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
this.doClose(); this.doClose();
this.$refs.noticeInfo.doShow(operate); this.$refs.noticeInfo.doShow();
}); });
}, },
cancel() { cancel() {

12
src/store/modules/exam.js
View File

@ -74,15 +74,15 @@ const exam = {
actions: { actions: {
start({ commit }) { start({ commit }) {
commit('setStarted', true); commit('setStarted', true);
commit('setSuspend', false); // commit('setSuspend', false);
commit('setUsedTime', 0); // commit('setUsedTime', 0);
commit('countUsedTime'); // commit('countUsedTime');
}, },
over({ commit }) { over({ commit }) {
commit('setStarted', false); commit('setStarted', false);
commit('setSuspend', true); // commit('setSuspend', true);
commit('setUsedTime', 0); // commit('setUsedTime', 0);
commit('stopCountTime'); // commit('stopCountTime');
}, },
isOver() { isOver() {
const trainingList = store.getters['trainingList/trainingList']; const trainingList = store.getters['trainingList/trainingList'];

4
src/views/newMap/displayNew/exam/index.vue
View File

@ -98,6 +98,7 @@ export default {
this.isDisable = true; this.isDisable = true;
startTrainingNew({ id: this.$route.query.trainingId }, this.group).then(response => { startTrainingNew({ id: this.$route.query.trainingId }, this.group).then(response => {
this.$store.dispatch('training/examModeStart'); this.$store.dispatch('training/examModeStart');
this.$store.dispatch('exam/start');
this.$store.dispatch('map/clearJlmapTrainView').then(() => { this.$store.dispatch('map/clearJlmapTrainView').then(() => {
this.$store.dispatch('training/setMapDefaultState').then(() => { this.$store.dispatch('training/setMapDefaultState').then(() => {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
@ -117,7 +118,7 @@ export default {
end() { end() {
if (this.$route.query.trainingId) { if (this.$route.query.trainingId) {
this.isDisable = false; this.isDisable = false;
if (this.$store.state.training.started) { if (this.$store.state.exam.started) {
const model = { const model = {
id: this.$route.query.examQuestionId, id: this.$route.query.examQuestionId,
usedTime: this.$store.state.training.usedTime, usedTime: this.$store.state.training.usedTime,
@ -125,6 +126,7 @@ export default {
}; };
this.$store.dispatch('training/end', null); this.$store.dispatch('training/end', null);
this.$store.dispatch('exam/over');
finishOneExamQuestion(model).then(response => { finishOneExamQuestion(model).then(response => {
this.$store.dispatch('training/setStopCountTime'); this.$store.dispatch('training/setStopCountTime');
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');