fix_增加用户组与权限的国际化

This commit is contained in:
wxg0103 2021-11-04 15:55:42 +08:00 committed by 刘瑞斌
parent cb93355fbc
commit 417eafca9a
6 changed files with 17 additions and 5 deletions

View File

@ -11,7 +11,7 @@
<el-menu-item :index="'/project/member'" v-permission="['PROJECT_USER:READ']">
{{ $t('project.member') }}
</el-menu-item>
<el-menu-item :index="'/project/usergroup'" v-permission="['SYSTEM_USER:READ+CREATE']">
<el-menu-item :index="'/project/usergroup'" v-permission="['SYSTEM_GROUP:READ+CREATE','ORGANIZATION_GROUP:READ+CREATE']">
{{ $t('project.group_permission') }}
</el-menu-item>
<el-menu-item :index="'/project/env'" v-permission="['PROJECT_ENVIRONMENT:READ']"

View File

@ -55,7 +55,7 @@
</div>
<div style="float: left">
<span class="title" @click="click('/project/usergroup', ['PROJECT_USER:READ'])">
{{ $t('project.group_permission') }}
{{ $t('group.group_permission') }}
</span><br/>
<span class="desc">{{ $t('project.group_desc') }}</span>
</div>

View File

@ -12,7 +12,7 @@
<el-table-column prop="name" :label="$t('commons.name')" show-overflow-tooltip/>
<el-table-column prop="type" :label="$t('group.type')">
<template v-slot="scope">
<span>{{ userGroupType[scope.row.type] ? userGroupType[scope.row.type] : scope.row.type }}</span>
<span>{{ userGroupType[scope.row.type] ? $t(userGroupType[scope.row.type]) : scope.row.type }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('commons.member')" width="100">
@ -22,7 +22,12 @@
</el-link>
</template>
</el-table-column>
<el-table-column prop="scopeName" :label="$t('group.scope')"/>
<el-table-column prop="scopeName" :label="$t('group.scope')">
<template v-slot="scope">
<span v-if="scope.row.scopeId ==='global'">{{ $t('group.global') }}</span>
<span v-else>{{ scope.row.scopeName }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" :label="$t('commons.create_time')" sortable show-overflow-tooltip>
<template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
@ -77,7 +82,7 @@ import GroupMember from "@/business/components/settings/system/group/GroupMember
import {getCurrentProjectID} from "@/common/js/utils";
export default {
name: "ProjectUserGroup",
name: "UserGroup",
components: {
GroupMember,
EditUserGroup,

View File

@ -547,6 +547,7 @@ export default {
create: 'Create Project',
edit: 'Edit Project',
delete: 'Delete project',
group_permission: 'Permission',
delete_confirm: 'Deleting this project will delete all test resources under this project. Are you sure you want to delete?',
delete_tip: 'Deleting this project will delete all test resources under this project. Are you sure you want to delete?',
file_delete_tip: 'Deleting this project file: {0}',
@ -604,6 +605,7 @@ export default {
env_desc: 'Project operating environment',
file_desc: 'Jar package and resource file management',
log_desc: 'The whole operation process of the project',
group_desc: 'Add user groups and permissions and global configuration',
code_segment_desc: 'Custom code snippet',
test_case_custom_id: 'Test Case Custom ID',
scenario_custom_id: 'Scenario Custom ID',

View File

@ -565,6 +565,8 @@ export default {
zentao_id: 'Zentao项目ID',
azureDevops_id: 'AzureDevops项目ID',
manager: '项目管理',
group_permission: '用户组与权限',
global: '全局',
no_data: '无数据',
select: '选择项目',
repeatable: '接口定义URL可重复',
@ -605,6 +607,7 @@ export default {
creator: '创建人',
create_time: '创建时间',
member_desc: '添加项目成员以及项目成员管理',
group_desc: '添加用户组与权限以及全局配置',
env_desc: '项目运行环境以及全局配置',
file_desc: 'jar包以及资源文件管理',
log_desc: '项目全部操作过程',

View File

@ -551,6 +551,7 @@ export default {
edit: '編輯項目',
delete: '刪除項目',
delete_confirm: '確定要刪除這個項目嗎?',
group_permission: '用戶組與許可權',
delete_tip: '刪除該項目,會刪除該項目下所有測試資源,確定要刪除嗎?',
file_delete_tip: '刪除該項目的文件: {0}',
search_by_name: '根據名稱搜索',
@ -608,6 +609,7 @@ export default {
env_desc: '項目運行環境以及全局配置',
file_desc: 'jar包以及資源文件管理',
log_desc: '項目全部操作過程',
group_desc: '添加用戶組與許可權以及全局配置',
code_segment_desc: '自定義代碼片段',
test_case_custom_id: '測試用例自定義ID',
scenario_custom_id: '場景自定義ID',