You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/05 13:39:19 UTC
[incubator-linkis] branch dev-1.2.1 updated: [Linkis-Web] Resource Management adjust defalut page . #2567 (#2587)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.1 by this push:
new 49df212c7 [Linkis-Web] Resource Management adjust defalut page . #2567 (#2587)
49df212c7 is described below
commit 49df212c71eb6e9e011a77168b2e0db889baa733
Author: zhaoyun006 <27...@qq.com>
AuthorDate: Fri Aug 5 21:39:14 2022 +0800
[Linkis-Web] Resource Management adjust defalut page . #2567 (#2587)
* Linkis-web]Resource Management English adjustment #2569
* [Linkis-Web] Resource Management adjust defalut page
Co-authored-by: zhaozhiqiang <zh...@lixiang.com>
---
linkis-web/src/apps/linkis/i18n/common/en.json | 2 +-
linkis-web/src/apps/linkis/i18n/common/zh.json | 2 +-
linkis-web/src/apps/linkis/view/linkis/index.vue | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json b/linkis-web/src/apps/linkis/i18n/common/en.json
index bc3de285a..778c17057 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -143,7 +143,7 @@
"children": {
"globalHistory": "Global History",
"resource": "Resource Manager",
- "resourceEngineConnList": "History Engine List",
+ "resourceEngineConnList": "History Engine",
"setting": "Settings",
"dateReport": "Global Variables",
"globalValiable": "Frequently Asked",
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json b/linkis-web/src/apps/linkis/i18n/common/zh.json
index 8cb191b8c..e05663727 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -145,7 +145,7 @@
"children": {
"globalHistory": "全局历史",
"resource": "资源管理",
- "resourceEngineConnList": "历史引擎信息",
+ "resourceEngineConnList": "历史引擎",
"setting": "参数配置",
"dateReport": "全局变量",
"globalValiable": "常见问题",
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index d8b835784..77fa892d1 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -67,9 +67,9 @@
<BreadcrumbItem>EngineConnList</BreadcrumbItem>
</template>
</Breadcrumb>
- <Tabs v-if="$route.name === 'resource' || $route.name === 'resourceEngineConnList'" value="resource" @on-click="clickResourceTab" class="resource-tab">
- <Tab-pane name="resource" :label="$t('message.linkis.sideNavList.function.children.resource')" href="/resource"></Tab-pane>
+ <Tabs v-if="$route.name === 'resource' || $route.name === 'resourceEngineConnList'" value="resourceEngineConnList" @on-click="clickResourceTab" class="resource-tab">
<Tab-pane name="resourceEngineConnList" :label="$t('message.linkis.sideNavList.function.children.resourceEngineConnList')" href="/ecm"></Tab-pane>
+ <Tab-pane name="resource" :label="$t('message.linkis.sideNavList.function.children.resource')" href="/resource"></Tab-pane>
</Tabs>
</div>
<div
@@ -96,7 +96,7 @@ export default {
icon: 'ios-options',
children: [
{ key: '1-1', name: this.$t('message.linkis.sideNavList.function.children.globalHistory'), path: '/console/globalHistory' },
- { key: '1-2', name: this.$t('message.linkis.sideNavList.function.children.resource'), path: '/console/resource' },
+ { key: '1-2', name: this.$t('message.linkis.sideNavList.function.children.resource'), path: '/console/resourceEngineConnList' },
{ key: '1-3', name: this.$t('message.linkis.sideNavList.function.children.setting'), path: '/console/setting' },
{ key: '1-4', name: this.$t('message.linkis.sideNavList.function.children.dateReport'), path: '/console/globalValiable' },
{ key: '1-6', name: this.$t('message.linkis.sideNavList.function.children.ECMManage'), path: '/console/ECM' },
@@ -111,7 +111,7 @@ export default {
padding: 0,
icon: 'ios-options',
children: [
- {key: '1-9-1', name: this.$t('message.linkis.sideNavList.function.children.udfFunctionManage'), path: '/console/urm/udfManagement'},
+ {key: '1-9-1', name: this.$t('message.linkis.sideNavList.function.children.udfFunctionManage'), path: '/console/urm/udfManagement'},
{key: '1-9-2', name: this.$t('message.linkis.sideNavList.function.children.functionManagement'), path: '/console/urm/functionManagement'}
]
},
@@ -217,4 +217,4 @@ export default {
border-bottom: 0;
}
}
-</style>
\ No newline at end of file
+</style>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org