From 9a768d9e8da67cd29964cb7904bb934bfc0ed255 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 18 May 2021 14:09:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V8__system.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/resources/db/migration/V8__system.sql b/backend/src/main/resources/db/migration/V8__system.sql index 2645f831bb..677a52c250 100644 --- a/backend/src/main/resources/db/migration/V8__system.sql +++ b/backend/src/main/resources/db/migration/V8__system.sql @@ -101,6 +101,7 @@ INSERT INTO `sys_menu` VALUES (40, 1, 0, 1, '模板管理', '模板管理', 'pan INSERT INTO `sys_menu` VALUES (41, 1, 0, 1, '权限管理', '权限管理', 'system/permission/index', 14, 'password', 'system/permission/index', b'0', b'0', b'0', 'sysparam:read', NULL, NULL, NULL, 1620447312657); INSERT INTO `sys_menu` VALUES (50, 0, 0, 1, '个人信息', '个人信息', 'system/user/privateForm', 999, NULL, '/person-info', b'0', b'0', b'1', NULL, NULL, NULL, NULL, NULL); INSERT INTO `sys_menu` VALUES (51, 0, 0, 1, '重置密码', '重置密码', 'system/user/personPwd', 999, NULL, '/person-pwd', b'0', b'0', b'1', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `sys_menu` VALUES (52, 1, 0, 1, '关于', '关于', 'system/about/index', 16, 'system', 'about', b'0', b'0', b'0', NULL, NULL, NULL, NULL, 1620897406691); COMMIT; SET FOREIGN_KEY_CHECKS = 1; From 78d65f032a03ede3eb4919b2988df79b9ffcebe0 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 18 May 2021 14:09:51 +0800 Subject: [PATCH 2/3] feat(dashboard):ui fix --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- frontend/src/views/panel/list/PanelMain.vue | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d4a9e3d59f..06332c721c 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -821,7 +821,7 @@ export default { back: 'Back', view: 'Chart', edit: 'Edit', - panel_list: 'Panel List', + panel_list: 'Panel', module: 'Component', filter_module: 'Filter Component', select_by_module: 'Select by Component', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bf9037fb98..fe55b5b9d6 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -807,7 +807,7 @@ export default { datalist: '視圖列表', group: '目錄', panel: '儀表盤', - panel_list: '儀表盤列表', + panel_list: '儀表盤', groupAdd: '新建目錄', panelAdd: '新建儀表盤', delete: '刪除', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 41844c03cb..eba65a1690 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -808,7 +808,7 @@ export default { datalist: '视图列表', group: '目录', panel: '仪表盘', - panel_list: '仪表盘列表', + panel_list: '仪表盘', groupAdd: '新建目录', panelAdd: '新建仪表盘', delete: '删除', diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue index 8d8b54f66c..1fc7311ba1 100644 --- a/frontend/src/views/panel/list/PanelMain.vue +++ b/frontend/src/views/panel/list/PanelMain.vue @@ -3,15 +3,15 @@ - {{ $t('panel.panel_list')}} + {{ $t('panel.panel_list') }} - {{ $t('panel.store')}} + {{ $t('panel.store') }} - {{ $t('panel.share')}} + {{ $t('panel.share') }} From f8078b0196beaeeeee1539ee5458734c985b7ee3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 18 May 2021 14:33:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20topBar=E5=A4=B4=E9=83=A8=E7=8E=B0?= =?UTF-8?q?=E5=AE=9Elic=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/layout/components/Licbar.vue | 5 ++++- frontend/src/store/getters.js | 1 + frontend/src/store/modules/lic.js | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/layout/components/Licbar.vue b/frontend/src/layout/components/Licbar.vue index 66575df2fe..4cc2b023d1 100644 --- a/frontend/src/layout/components/Licbar.vue +++ b/frontend/src/layout/components/Licbar.vue @@ -1,6 +1,6 @@ @@ -22,6 +22,9 @@ export default { }, licstatus() { return this.$store.state.lic.validate + }, + licMsg() { + return this.$store.state.lic.licMsg } }, diff --git a/frontend/src/store/getters.js b/frontend/src/store/getters.js index c3159803c6..e7030857aa 100644 --- a/frontend/src/store/getters.js +++ b/frontend/src/store/getters.js @@ -23,6 +23,7 @@ const getters = { dialogWidgetMap: state => state.application.dialogWidgetMap, drawWidgetMap: state => state.application.drawWidgetMap, validate: state => state.lic.validate, + licMsg: state => state.lic.licMsg, uiInfo: state => state.user.uiInfo } export default getters diff --git a/frontend/src/store/modules/lic.js b/frontend/src/store/modules/lic.js index bce435be97..64f5ee8254 100644 --- a/frontend/src/store/modules/lic.js +++ b/frontend/src/store/modules/lic.js @@ -1,11 +1,15 @@ import { validateLic } from '@/api/system/lic' const state = { - validate: true + validate: true, + licMsg: null } const mutations = { SET_VALIDATE: (state, data) => { state.validate = data + }, + SET_LIC_MSG: (state, msg) => { + state.licMsg = msg } } @@ -19,9 +23,11 @@ const actions = { validateLic().then(response => { const { data } = response commit('SET_VALIDATE', true) + commit('SET_LIC_MSG', null) resolve(data) }).catch(error => { commit('SET_VALIDATE', false) + commit('SET_LIC_MSG', error.response.data.message) reject(error) }) })