diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue index e693db6fd..7c1686b6c 100644 --- a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue +++ b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue @@ -276,6 +276,7 @@ export default { commitOperate(operate, {}, 2).then(({valid})=>{ this.loading = false; if (valid) { + this.$emit('close'); this.doClose(); } }).catch(() => { diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue index ff19a9a30..3f659d704 100644 --- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue @@ -36,10 +36,10 @@ {{ $t('menu.cancel') }} - - - + + + diff --git a/src/jmapNew/theme/components/menus/eachChildMenu.vue b/src/jmapNew/theme/components/menus/eachChildMenu.vue index 99519d357..2a60fee0e 100644 --- a/src/jmapNew/theme/components/menus/eachChildMenu.vue +++ b/src/jmapNew/theme/components/menus/eachChildMenu.vue @@ -89,6 +89,13 @@ export default { 'mode' ]) }, + watch: { + index(val) { + if (val == -1) { + this.active = -1; + } + } + }, methods:{ getDomId(item) { if (item && item.operate) { @@ -121,6 +128,7 @@ export default { type: 'bar', operation: item.operate.operation }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$emit('active', index);