diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index a096a7ff41..afd8a15af0 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -15,6 +15,8 @@ \u5220\u9664\u89D2\u8272=Delete Role \u5220\u9664\u8FDE\u63A5=Delete Connection \u663E\u793A\u8BBE\u7F6E=Display +\u5E73\u53F0\u5BF9\u63A5=Platform Docking +\u8BA4\u8BC1\u8BBE\u7F6E=Authentication Setting \u7CFB\u7EDF\u53C2\u6570=System Param \u53C2\u6570\u7BA1\u7406=Parameter \u6570\u636E\u6E90=Data Source diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index d0dc945e12..e0efdd38d8 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -15,6 +15,8 @@ \u5220\u9664\u89D2\u8272=\u5220\u9664\u89D2\u8272 \u5220\u9664\u8FDE\u63A5=\u5220\u9664\u8FDE\u63A5 \u663E\u793A\u8BBE\u7F6E=\u663E\u793A\u8BBE\u7F6E +\u5E73\u53F0\u5BF9\u63A5=\u5E73\u53F0\u5BF9\u63A5 +\u8BA4\u8BC1\u8BBE\u7F6E=\u8BA4\u8BC1\u8BBE\u7F6E \u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7EDF\u53C2\u6570 \u53C2\u6570\u7BA1\u7406=\u53C2\u6570\u7BA1\u7406 \u6570\u636E\u6E90=\u6570\u636E\u6E90 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 84c61b385e..022e0606ac 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -15,6 +15,8 @@ \u5220\u9664\u89D2\u8272=\u522A\u9664\u89D2\u8272 \u522A\u9664\u8FDE\u63A5=\u522A\u9664\u93C8\u63A5 \u663E\u793A\u8BBE\u7F6E=\u986F\u793A\u8A2D\u7F6E +\u5E73\u53F0\u5BF9\u63A5=\u5E73\u81FA\u5C0D\u63A5 +\u8BA4\u8BC1\u8BBE\u7F6E=\u8A8D\u8B49\u8A2D\u7F6E \u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7D71\u53C3\u6578 \u53C2\u6570\u7BA1\u7406=\u53C3\u6578\u7BA1\u7406 \u6570\u636E\u6E90=\u6578\u64DA\u6E90 diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue index 8d4afc52b5..6c71c60ab5 100644 --- a/frontend/src/components/business/DeLayoutContent.vue +++ b/frontend/src/components/business/DeLayoutContent.vue @@ -34,7 +34,7 @@ export default { return backPath || backName || backTo }, needInnerPadding() { - return ['sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name) + return ['sys-identification', 'sys-abutment', 'sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name) } } } diff --git a/frontend/src/views/system/SysParam/index.vue b/frontend/src/views/system/SysParam/index.vue index cfd202494c..3d79ce875a 100644 --- a/frontend/src/views/system/SysParam/index.vue +++ b/frontend/src/views/system/SysParam/index.vue @@ -18,20 +18,6 @@ - - - - - - - - -
- - - - - -
diff --git a/frontend/src/views/system/plugin/dynamic.vue b/frontend/src/views/system/plugin/dynamic.vue index fcf9437f14..afdc2252a6 100644 --- a/frontend/src/views/system/plugin/dynamic.vue +++ b/frontend/src/views/system/plugin/dynamic.vue @@ -25,7 +25,7 @@ import DeLayoutContent from '@/components/business/DeLayoutContent' import AsyncComponent from '@/components/AsyncComponent' import i18n from '@/lang' import bus from '@/utils/bus' -import { execute } from '@/api/system/dynamic' +import { execute, get } from '@/api/system/dynamic' export default { name: 'Dynamic', components: { @@ -56,18 +56,24 @@ export default { innerLoadingNames: ['SystemDept', 'SystemRole', 'SystemAuth'] } }, - created() { - if (this.jsname && this.menuid) { - this.showAsync = true - this.url = this.baseUrl + this.menuid - // this.url = 'http://localhost:8081/PluginDemo.js' - // this.url = 'http://localhost:8081/SystemParam.js' - } else { - this.showAsync = false + watch: { + 'menuid' : function() { + this.init() } }, + created() { + this.init() + }, methods: { + init() { + if (this.jsname && this.menuid) { + this.showAsync = true + this.url = this.baseUrl + this.menuid + } else { + this.showAsync = false + } + }, // hasLicense executeAxios(options) { execute(options).then(res => {