diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
index 8dd0fad581..f80bed2a70 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
@@ -11,32 +11,34 @@
:placeholder="$t('prop(required)')"
maxlength="64"
@on-blur="_verifProp()"
- style="width: 164px;">
+ :style="inputStyle">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ :style="inputStyle">
@@ -57,7 +59,7 @@
-
+
@@ -173,6 +175,11 @@
created () {
this.localParamsList = this.udpList
},
+ computed: {
+ inputStyle () {
+ return `width:${this.hide ? 160 : 262}px`
+ }
+ },
mounted () {
},
components: { }
@@ -197,6 +204,7 @@
}
.add {
a {
+ color: #000;
.iconfont {
font-size: 18px;
vertical-align: middle;
@@ -205,5 +213,16 @@
}
}
}
+ .add-dp{
+ a {
+ color: #0097e0;
+ .iconfont {
+ font-size: 18px;
+ vertical-align: middle;
+ display: inline-block;
+ margin-top: 2px;
+ }
+ }
+ }
}
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
index 38554addcf..a46999ec20 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@@ -138,8 +138,8 @@
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
index 8de2df7083..81f9da5325 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
@@ -1,5 +1,6 @@
+
{{$t('Global parameters')}}
@@ -22,7 +23,8 @@
-
+
+
-
-
+
\ No newline at end of file
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/list.vue
similarity index 100%
rename from escheduler-ui/src/js/conf/home/pages/security/pages/servers/_source/list.vue
rename to escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/list.vue
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue
new file mode 100644
index 0000000000..e00e47e025
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue
new file mode 100644
index 0000000000..5615b1db37
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue
@@ -0,0 +1,40 @@
+
+
+ apiserver
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
similarity index 96%
rename from escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue
rename to escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
index c629857c6d..5e71ca176a 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/master/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
@@ -13,7 +13,7 @@
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue
new file mode 100644
index 0000000000..87b54a218a
--- /dev/null
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue
@@ -0,0 +1,40 @@
+
+
+ rpcserver
+
+
+
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
similarity index 96%
rename from escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue
rename to escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
index e720cdfd22..8112ea372e 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/pages/worker/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
@@ -13,7 +13,7 @@
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/servers/index.vue
deleted file mode 100644
index 18b61bad21..0000000000
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/servers/index.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
index 89c50580f4..2f8156b29d 100644
--- a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
@@ -24,7 +24,7 @@
更新时间
|
-
+ |
{{$t('Operation')}}
|
diff --git a/escheduler-ui/src/js/conf/home/router/index.js b/escheduler-ui/src/js/conf/home/router/index.js
index f1a47ed433..7dda210065 100644
--- a/escheduler-ui/src/js/conf/home/router/index.js
+++ b/escheduler-ui/src/js/conf/home/router/index.js
@@ -317,35 +317,6 @@ const router = new Router({
meta: {
title: `${i18n.$t('Queue manage')}`
}
- },
- {
- path: '/security/servers',
- name: 'servers-manage',
- component: resolve => require(['../pages/security/pages/servers/index'], resolve),
- meta: {
- title: `${i18n.$t('Servers manage')}`
- },
- redirect: {
- name: 'servers-master'
- },
- children: [
- {
- path: '/security/servers/master',
- name: 'servers-master',
- component: resolve => require(['../pages/security/pages/servers/pages/master/index'], resolve),
- meta: {
- title: `${i18n.$t('Service-Master')}`
- }
- },
- {
- path: '/security/servers/worker',
- name: 'servers-worker',
- component: resolve => require(['../pages/security/pages/servers/pages/worker/index'], resolve),
- meta: {
- title: `${i18n.$t('Service-Worker')}`
- }
- }
- ]
}
]
},
@@ -385,6 +356,75 @@ const router = new Router({
}
}
]
+ },
+ {
+ path: '/monitor',
+ name: 'monitor',
+ component: resolve => require(['../pages/monitor/index'], resolve),
+ meta: {
+ title: `monitor`
+ },
+ redirect: {
+ name: 'servers-master'
+ },
+ children: [
+ {
+ path: '/monitor/servers/master',
+ name: 'servers-master',
+ component: resolve => require(['../pages/monitor/pages/servers/master'], resolve),
+ meta: {
+ title: `${i18n.$t('Service-Master')}`
+ }
+ },
+ {
+ path: '/monitor/servers/worker',
+ name: 'servers-worker',
+ component: resolve => require(['../pages/monitor/pages/servers/worker'], resolve),
+ meta: {
+ title: `${i18n.$t('Service-Worker')}`
+ }
+ },
+ {
+ path: '/monitor/servers/alert',
+ name: 'servers-alert',
+ component: resolve => require(['../pages/monitor/pages/servers/alert'], resolve),
+ meta: {
+ title: `alert`
+ }
+ },
+ {
+ path: '/monitor/servers/rpcserver',
+ name: 'servers-rpcserver',
+ component: resolve => require(['../pages/monitor/pages/servers/rpcserver'], resolve),
+ meta: {
+ title: `rpcserver`
+ }
+ },
+ {
+ path: '/monitor/servers/zookeeper',
+ name: 'servers-zookeeper',
+ component: resolve => require(['../pages/monitor/pages/servers/zookeeper'], resolve),
+ meta: {
+ title: `zookeeper`
+ }
+ },
+ {
+ path: '/monitor/servers/apiserver',
+ name: 'servers-apiserver',
+ component: resolve => require(['../pages/monitor/pages/servers/apiserver'], resolve),
+ meta: {
+ title: `apiserver`
+ }
+ },
+ {
+ path: '/monitor/servers/mysql',
+ name: 'servers-mysql',
+ component: resolve => require(['../pages/monitor/pages/servers/mysql'], resolve),
+ meta: {
+ title: `mysql`
+ }
+ }
+ ]
}
]
})
diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 311a25a132..6abbe73fc7 100644
--- a/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -23,7 +23,7 @@ let menu = {
projects: [
{
name: `${i18n.$t('Project Home')}`,
- id: 1,
+ id: 0,
path: 'projects-index',
isOpen: true,
disabled: true,
@@ -32,7 +32,7 @@ let menu = {
},
{
name: `${i18n.$t('Process')}`,
- id: 2,
+ id: 1,
path: '',
isOpen: true,
disabled: true,
@@ -41,31 +41,31 @@ let menu = {
{
name: `${i18n.$t('Process definition')}`,
path: 'definition',
- id: 1,
+ id: 0,
disabled: true
},
{
name: `${i18n.$t('Process Instance')}`,
path: 'instance',
- id: 2,
+ id: 1,
disabled: true
},
{
name: `${i18n.$t('Task Instance')}`,
path: 'task-instance',
- id: 3,
+ id: 2,
disabled: true
},
{
name: `${i18n.$t('Task record')}`,
path: 'task-record',
- id: 4,
+ id: 3,
disabled: config.recordSwitch
},
{
name: `${i18n.$t('History task record')}`,
path: 'history-task-record',
- id: 5,
+ id: 4,
disabled: config.recordSwitch
}
]
@@ -75,7 +75,7 @@ let menu = {
security: [
{
name: `${i18n.$t('Tenant Manage')}`,
- id: 1,
+ id: 0,
path: 'tenement-manage',
isOpen: true,
disabled: true,
@@ -93,7 +93,7 @@ let menu = {
},
{
name: `${i18n.$t('Warning group manage')}`,
- id: 1,
+ id: 2,
path: 'warning-groups-manage',
isOpen: true,
disabled: true,
@@ -102,40 +102,18 @@ let menu = {
},
{
name: `${i18n.$t('Queue manage')}`,
- id: 1,
+ id: 3,
path: 'queue-manage',
isOpen: true,
disabled: true,
icon: 'fa-recycle',
children: []
- },
- {
- name: `${i18n.$t('Servers manage')}`,
- id: 1,
- path: '',
- isOpen: true,
- disabled: true,
- icon: 'fa-server',
- children: [
- {
- name: 'master',
- path: 'servers-master',
- id: 1,
- disabled: true
- },
- {
- name: 'worker',
- path: 'servers-worker',
- id: 2,
- disabled: true
- }
- ]
}
],
resource: [
{
name: `${i18n.$t('File Manage')}`,
- id: 1,
+ id: 0,
path: 'file',
isOpen: true,
icon: 'fa-files-o',
@@ -153,13 +131,13 @@ let menu = {
{
name: `${i18n.$t('Resource manage')}`,
path: 'resource-udf-resource',
- id: 1,
+ id: 0,
disabled: true
},
{
name: `${i18n.$t('Function manage')}`,
path: 'resource-udf-function',
- id: 2,
+ id: 1,
disabled: true
}
]
@@ -193,6 +171,60 @@ let menu = {
children: [],
disabled: !Permissions.getAuth()
}
+ ],
+ monitor: [
+ {
+ name: `${i18n.$t('Servers manage')}`,
+ id: 0,
+ path: '',
+ isOpen: true,
+ disabled: true,
+ icon: 'fa-server',
+ children: [
+ {
+ name: 'Master',
+ path: 'servers-master',
+ id: 0,
+ disabled: true
+ },
+ {
+ name: 'Worker',
+ path: 'servers-worker',
+ id: 1,
+ disabled: true
+ },
+ {
+ name: 'Alert',
+ path: 'servers-alert',
+ id: 2,
+ disabled: true
+ },
+ {
+ name: 'RpcServer',
+ path: 'servers-rpcserver',
+ id: 3,
+ disabled: true
+ },
+ {
+ name: 'Zookeeper',
+ path: 'servers-zookeeper',
+ id: 4,
+ disabled: true
+ },
+ {
+ name: 'ApiServer',
+ path: 'servers-apiserver',
+ id: 5,
+ disabled: true
+ },
+ {
+ name: 'Mysql',
+ path: 'servers-mysql',
+ id: 6,
+ disabled: true
+ }
+ ]
+ }
]
}
diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 683f9ac5aa..8502111ff2 100644
--- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -295,6 +295,7 @@ export default {
'Waiting for dependence': '等待依赖',
'Start': '运行',
'Copy': '复制节点',
+ 'Delete': '删除',
'Please enter keyword': '请输入关键词',
'File Upload': '文件上传',
'Drag the file into the current upload window': '请将文件拖拽到当前上传窗口内!',