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 2021-03-08 10:12:21 +08:00
commit 2a977c8b43
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
View File

@ -276,6 +276,7 @@ export default {
commitOperate(operate, {}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.$emit('close');
this.doClose();
}
}).catch(() => {

6
src/jmapNew/theme/components/menus/dialog/routeControl.vue
View File

@ -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" />
<password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
<notice-info ref="noticeInfo" :pop-class="popClass" />
<confirm-control ref="confirmControl" :pop-class="popClass" @close="doClose" />
<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>

8
src/jmapNew/theme/components/menus/eachChildMenu.vue
View File

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