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.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
fan 2019-12-24 13:52:22 +08:00
commit d842be60ce
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/langs/en/permission.js
View File

@ -38,5 +38,6 @@ export default {
transferTips:'You can receive multiple permissions at a time, and the permissions you receive can continue to be transferred.', transferTips:'You can receive multiple permissions at a time, and the permissions you receive can continue to be transferred.',
distributeTips:'Only one permission can be obtained at a time. The permission received is a dedicated permission and cannot be redistributed.', distributeTips:'Only one permission can be obtained at a time. The permission received is a dedicated permission and cannot be redistributed.',
distributeId: 'Distribute id', distributeId: 'Distribute id',
sortType:'SortType' sortType:'SortType',
nickName:'nickName'
}; };

3
src/i18n/langs/zh/permission.js
View File

@ -45,5 +45,6 @@ export default {
transferTips:'一次可以领取多个权限，领到的权限可以继续转赠', transferTips:'一次可以领取多个权限，领到的权限可以继续转赠',
distributeTips:'一次只能领取一个权限，领到的权限是专用权限，不可再次分发', distributeTips:'一次只能领取一个权限，领到的权限是专用权限，不可再次分发',
distributeId: '分发ID', distributeId: '分发ID',
sortType:'排序方式' sortType:'排序方式',
nickName:'昵称'
}; };

9
src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
View File

@ -132,7 +132,8 @@ export default {
buttons: [ buttons: [
{ {
name: this.$t('map.preview'), name: this.$t('map.preview'),
handleClick: this.flankProtectionSwitchDetail handleClick: this.flankProtectionSwitchDetail,
showControl: (row) => { return row.routeFlankProtectionList.length > 0; }
} }
] ]
}, },
@ -163,7 +164,8 @@ export default {
buttons: [ buttons: [
{ {
name: this.$t('map.preview'), name: this.$t('map.preview'),
handleClick: this.routeSwitchDetail handleClick: this.routeSwitchDetail,
showControl: (row) => { return row.routeSwitchList.length > 0; }
} }
] ]
}, },
@ -173,7 +175,8 @@ export default {
buttons: [ buttons: [
{ {
name: this.$t('map.relation'), name: this.$t('map.relation'),
handleClick: this.conflictingRouteSection handleClick: this.conflictingRouteSection,
showControl: (row) => { return row.conflictingRouteList.length > 0; }
} }
] ]
}, },

2
src/views/orderauthor/permission/index.vue
View File

@ -167,7 +167,7 @@ export default {
name: this.$t('orderAuthor.recovery'), name: this.$t('orderAuthor.recovery'),
handleClick: this.handleRestore, handleClick: this.handleRestore,
type: 'danger', type: 'danger',
showControl: (row) => { return row.status == '1' && row.canRestore } showControl: (row) => { return row.status == '1' && row.canRestore; }
} }
] ]
} }

5
src/views/orderauthor/rules/index.vue
View File

@ -88,6 +88,11 @@ export default {
sortable:'custom', sortable:'custom',
sortBy:'sortOrder' sortBy:'sortOrder'
}, },
{
title: this.$t('permission.nickName'),
width: '200',
prop: 'userNickName'
},
{ {
title: this.$t('permission.permissionName'), title: this.$t('permission.permissionName'),
width: '200', width: '200',