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

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
zyy 2019-11-13 09:07:04 +08:00
commit e9dbd6ef31
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/components/limits/distribute.vue
View File

@ -183,6 +183,7 @@ export default {
this.formModel.permissionList = jsonData; this.formModel.permissionList = jsonData;
} else { } else {
this.isDisabled = true; this.isDisabled = true;
this.formModel.permissionList = [];
} }
}).catch(()=>{ }).catch(()=>{
this.$messageBox(this.$t('error.getPermissionListFailed')); this.$messageBox(this.$t('error.getPermissionListFailed'));

1
src/views/components/limits/transfer.vue
View File

@ -184,6 +184,7 @@ export default {
this.formModel.permissionList = jsonData; this.formModel.permissionList = jsonData;
} else { } else {
this.isDisabled = true; this.isDisabled = true;
this.formModel.permissionList = [];
} }
}).catch(()=>{ }).catch(()=>{
this.$messageBox(this.$t('error.getPermissionListFailed')); this.$messageBox(this.$t('error.getPermissionListFailed'));

2
src/views/display/menuDemon.vue
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="display-draft"> <div class="display-draft">
<el-button-group> <el-button-group>
<el-button v-if="isShowScheduling" type="primary" @click="">{{ $t('display.demon.dispatchingPlan') }}</el-button> <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
<el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button> <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<template v-if="isShowQuest"> <template v-if="isShowQuest">
<!-- && !isDesignPlatform --> <!-- && !isDesignPlatform -->

7
src/views/display/menuSchema.vue
View File

@ -44,7 +44,7 @@ export default {
OperateMode: OperateMode, OperateMode: OperateMode,
viewDisabled: true, viewDisabled: true,
runing: false, runing: false,
swch: '02', swch: '01',
swchList: [ swchList: [
{ value: '01', name: '现地' }, { value: '01', name: '现地' },
{ value: '02', name: '行调' } { value: '02', name: '行调' }
@ -62,8 +62,8 @@ export default {
return this.$route.params.mode === 'plan'; return this.$route.params.mode === 'plan';
}, },
isScript() { isScript() {
// return this.$route.params.mode === 'script'; return this.$route.params.mode === 'script';
return false; // return false;
}, },
isDemon() { isDemon() {
return this.$route.params.mode === 'demon'; return this.$route.params.mode === 'demon';
@ -96,7 +96,6 @@ export default {
getStationList(opt.mapId).then(response => { getStationList(opt.mapId).then(response => {
this.$store.dispatch('runPlan/setStations', response.data).then(() => { this.$store.dispatch('runPlan/setStations', response.data).then(() => {
if (this.$route.params.mode == 'plan') { if (this.$route.params.mode == 'plan') {
// debugger;
if (this.$route.query.from == 'user') { if (this.$route.query.from == 'user') {
// 测试运行图功能 // 测试运行图功能
getRpDetailByUserMapId(this.$route.query.planId).then(resp => { getRpDetailByUserMapId(this.$route.query.planId).then(resp => {