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

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(() => {

src/jmapNew/theme/components/menus/dialog/routeControl.vue

@@ -36,10 +36,10 @@
         <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.cancel') }}</el-button>
       </el-col>
     </el-row>
-    <confirm-control ref="confirmControl" :pop-class="popClass" />
+    <confirm-control ref="confirmControl" :pop-class="popClass" @close="doClose" />
-    <password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
-    <notice-info ref="noticeInfo" :pop-class="popClass" />
     <ning-bo-confirm-tip ref="ningBoConfirmTip" @close="doClose" />
+	<password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
   </el-dialog>
 </template>
 

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);