This commit is contained in:
shiziyuan9527 2020-05-11 18:08:00 +08:00
parent 2cf70f9484
commit d183914eff
3 changed files with 19 additions and 8 deletions

View File

@ -33,8 +33,8 @@
</span> </span>
<template v-slot:dropdown> <template v-slot:dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="personal">个人信息</el-dropdown-item> <el-dropdown-item command="personal">{{$t('commons.personal_information')}}</el-dropdown-item>
<el-dropdown-item command="logout">退出系统</el-dropdown-item> <el-dropdown-item command="logout">{{$t('commons.exit_system')}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
@ -62,16 +62,16 @@
data() { data() {
return { return {
organizationList: [ organizationList: [
{index: '7-1', name: '无组织'}, {index: '7-1', name: this.$t('organization.none')},
], ],
workspaceList: [ workspaceList: [
{index: '2-1', name: '无工作空间'}, {index: '2-1', name: this.$t('workspace.none')},
], ],
currentUserInfo: {}, currentUserInfo: {},
currentUserId: getCurrentUser().id, currentUserId: getCurrentUser().id,
workspaceIds: [], workspaceIds: [],
currentOrganizationName: '选择组织', currentOrganizationName: this.$t('organization.select'),
currentWorkspaceName: '选择工作空间' currentWorkspaceName: this.$t('workspace.select')
} }
}, },
computed: { computed: {
@ -113,7 +113,7 @@
this.$get("/workspace/list/orgworkspace/", response => { this.$get("/workspace/list/orgworkspace/", response => {
let data = response.data; let data = response.data;
if (data.length === 0) { if (data.length === 0) {
this.workspaceList = [{index: '1-1', name: '无工作区间'}] this.workspaceList = [{index: '1-1', name: this.$t('workspace.none')}]
} else { } else {
this.workspaceList = data; this.workspaceList = data;
let workspace = data.filter(r => r.id === this.currentUser.lastWorkspaceId); let workspace = data.filter(r => r.id === this.currentUser.lastWorkspaceId);
@ -122,7 +122,6 @@
localStorage.setItem(WORKSPACE_ID, workspace[0].id); localStorage.setItem(WORKSPACE_ID, workspace[0].id);
} }
} }
// this.workspaceIds = response.data.map(r = r.id);
}) })
} }
}, },

View File

@ -51,6 +51,8 @@ export default {
'delete': 'Delete', 'delete': 'Delete',
'not_filled': 'Not filled', 'not_filled': 'Not filled',
'search_by_name': 'Search by name', 'search_by_name': 'Search by name',
'personal_information': 'Personal Information',
'exit_system': 'Exit System',
}, },
workspace: { workspace: {
'create': 'Create Workspace', 'create': 'Create Workspace',
@ -62,6 +64,8 @@ export default {
'organization_name': 'Organization Name', 'organization_name': 'Organization Name',
'please_choose_organization': 'Please Choose Organization', 'please_choose_organization': 'Please Choose Organization',
'please_select_a_workspace_first': 'Please select a workspace first!', 'please_select_a_workspace_first': 'Please select a workspace first!',
'none': 'None Workspace',
'select': 'Select Workspace',
}, },
organization: { organization: {
'create': 'Create', 'create': 'Create',
@ -71,6 +75,8 @@ export default {
'select_organization': 'Please select organization', 'select_organization': 'Please select organization',
'search_by_name': 'Search by name', 'search_by_name': 'Search by name',
'special_characters_are_not_supported': 'Special characters are not supported', 'special_characters_are_not_supported': 'Special characters are not supported',
'none': 'None Organization',
'select': 'Select Organization',
}, },
project: { project: {
'recent': 'Recent Projects', 'recent': 'Recent Projects',

View File

@ -53,6 +53,8 @@ export default {
'not_filled': '未填写', 'not_filled': '未填写',
'please_select': '请选择', 'please_select': '请选择',
'search_by_name': '根据名称搜索', 'search_by_name': '根据名称搜索',
'personal_information': '个人信息',
'exit_system': '退出系统',
}, },
workspace: { workspace: {
'create': '创建工作空间', 'create': '创建工作空间',
@ -64,6 +66,8 @@ export default {
'organization_name': '所属组织', 'organization_name': '所属组织',
'please_choose_organization': '请选择组织', 'please_choose_organization': '请选择组织',
'please_select_a_workspace_first': '请先选择工作空间!', 'please_select_a_workspace_first': '请先选择工作空间!',
'none': '无工作空间',
'select': '选择工作区间',
}, },
organization: { organization: {
'create': '创建组织', 'create': '创建组织',
@ -73,6 +77,8 @@ export default {
'select_organization': '请选择组织', 'select_organization': '请选择组织',
'search_by_name': '根据名称搜索', 'search_by_name': '根据名称搜索',
'special_characters_are_not_supported': '不支持特殊字符', 'special_characters_are_not_supported': '不支持特殊字符',
'none': '无组织',
'select': '选择组织',
}, },
project: { project: {
'recent': '最近的项目', 'recent': '最近的项目',