diff --git a/escheduler-ui/.env b/escheduler-ui/.env
index 52ce563e9ba147a121d8fea54fcd55038f815b7a..d4dcd9f473fdce762abfd2c272181c6d88ba0cac 100644
--- a/escheduler-ui/.env
+++ b/escheduler-ui/.env
@@ -1,6 +1,6 @@
# 后端接口地址
-API_BASE = http://192.168.220.247:12345
+API_BASE = http://192.168.220.154:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
index 09f5363924bd0c3bd7f3a4aaa423dbbd80c74896..9834801c6c70b721ed0a784fc20d8f83bd1cb204 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
@@ -22,7 +22,10 @@
},
mixins: [disabledState],
props: {
- value: Number
+ value: {
+ type: Number,
+ default: -1
+ }
},
model: {
prop: 'value',
@@ -37,9 +40,15 @@
watch: {
},
created () {
- this.workerGroupsList = this.store.state.security.workerGroupsListAll || []
- if (!this.value) {
- this.$emit('workerGroupsEvent', this.workerGroupsList[0].id)
+ let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []
+ if (stateWorkerGroupsList.length) {
+ this.workerGroupsList = stateWorkerGroupsList
+ } else {
+ this.store.dispatch('security/getWorkerGroupsAll').then(res => {
+ this.$nextTick(() => {
+ this.workerGroupsList = res
+ })
+ })
}
}
}
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index a0cdc36713f06920b7528d506f7c4b12ac0f81d8..f185ba80f5e198863aa33f18810e41a5d337dfa5 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -221,7 +221,7 @@
// Task priority
taskInstancePriority: 'MEDIUM',
// worker group id
- workerGroupId: null
+ workerGroupId: -1
}
},
/**
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
index 5e71ca176a753ae20b206eb511a2378015270a4b..e9f9f2947fef9b70ef7c562b53b105bf45d24659 100644
--- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
+++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
@@ -1,13 +1,13 @@