diff --git a/src/common/lang/businessSupport/en.js b/src/common/lang/businessSupport/en.js index 6a0fa03..9aa013a 100644 --- a/src/common/lang/businessSupport/en.js +++ b/src/common/lang/businessSupport/en.js @@ -45,7 +45,7 @@ module.exports = { poster: 'Poster', answerNum: 'replies', top: '【top】', - cancelTop: 'untop', + cancelTop: 'Cancel Top up', setTop: 'Set To Top', answerQuestion: 'reply to a question', word: 'word', diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 8c1f7e9..a17eab1 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -621,7 +621,7 @@ module.exports = { // OCR文本识别 ocrTextRecognition: { upload: 'Upload', - getFile: 'Get files', + getFile: 'Get Files', standardCategory: 'Regulation Category', standardNumber: 'Regulation No.', standardName: 'Regulation Name', @@ -646,9 +646,9 @@ module.exports = { // 我的消息 my: { myMessage: 'My Message', - title: 'title', + title: 'Title', publisher: 'publisher', - readingStatus: 'readingStatus', + readingStatus: 'Reading Status', messageContent: 'Message Content', messageType: 'Message Type', allLabelsRead: 'All Mark as Read', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cdc24bd..bf7194f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -144,9 +144,9 @@ const user = { GetPermissionList ({ commit }) { return new Promise((resolve, reject) => { queryPermissionsByUser().then(response => { - const menuData = response.result.menu - const authData = response.result.auth - const allAuthData = response.result.allAuth + const menuData = (response.result || {}).menu || [] + const authData = (response.result || {}).auth || [] + const allAuthData = (response.result || {}).allAuth // Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 896dcbc..6e1f3cb 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -247,7 +247,8 @@ export default { title: this.$t('status'), align: 'center', width: 80, - dataIndex: 'status_dictText' + dataIndex: 'status_dictText', + scopedSlots: { customRender: 'dictText' } }, { diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 29d01d2..bf035f4 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -142,7 +142,7 @@ export default { align: 'center', dataIndex: 'msgCategory_dictText', width: 150, - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('message.my.publisher'), diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index e73646e..d7dbd1d 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -239,7 +239,8 @@ export default { align: 'center', width: 90, dataIndex: 'sex_dictText', - sorter: true + sorter: true, + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('phoneNumber'), @@ -275,7 +276,8 @@ export default { title: this.$t('status'), align: 'center', width: 80, - dataIndex: 'status_dictText' + dataIndex: 'status_dictText', + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('operation'), diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue index c8ef27b..040bc30 100644 --- a/src/views/system/modules/SelectUserModal.vue +++ b/src/views/system/modules/SelectUserModal.vue @@ -100,7 +100,8 @@ export default { title: this.$t('user.gender'), align: 'center', width: 100, - dataIndex: 'sex_dictText' + dataIndex: 'sex_dictText', + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('phoneNumber'), diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue index 7e01624..4c1a90e 100644 --- a/src/views/system/tags/pages/ClauseSplittingList.vue +++ b/src/views/system/tags/pages/ClauseSplittingList.vue @@ -103,7 +103,7 @@ export default { align: 'center', width: 100, dataIndex: 'fieldShowType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.fieldLength'), diff --git a/src/views/system/tags/pages/StandardList.vue b/src/views/system/tags/pages/StandardList.vue index 6d4e80b..a96ee18 100644 --- a/src/views/system/tags/pages/StandardList.vue +++ b/src/views/system/tags/pages/StandardList.vue @@ -136,7 +136,7 @@ export default { title: this.$t('system.tag.attributeType'), width: 100, dataIndex: 'fieldShowType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.fieldLength'), diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue index 28e98c7..083b185 100644 --- a/src/views/system/tags/pages/TagContent.vue +++ b/src/views/system/tags/pages/TagContent.vue @@ -96,7 +96,7 @@ export default { align: 'center', width: 100, dataIndex: 'attributeType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.describe'),