diff --git a/escheduler-ui/.env b/escheduler-ui/.env
index d4dcd9f473..52ce563e9b 100644
--- a/escheduler-ui/.env
+++ b/escheduler-ui/.env
@@ -1,6 +1,6 @@
# 后端接口地址
-API_BASE = http://192.168.220.154:12345
+API_BASE = http://192.168.220.247:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
index e7eac9442a..de94e0ee21 100644
--- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@@ -9,9 +9,9 @@
-
+
-
+
@@ -23,11 +23,13 @@
+
+
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
index bbe973f642..6031b590e0 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
@@ -28,7 +28,6 @@
import mSpin from '@/module/components/spin/spin'
import mCreateProject from './_source/createProject'
import mNoData from '@/module/components/noData/noData'
- import { setUrlParams } from '@/module/util/routerUtil'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -57,8 +56,11 @@
*/
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
- setUrlParams(this.searchParams)
- this._debounceGET()
+ this.searchParams.pageNo = 1
+ },
+
+ _page (val) {
+ this.searchParams.pageNo = val
},
_create (item) {
let self = this
@@ -86,11 +88,6 @@
_onUpdate () {
this._debounceGET()
},
- _page (val) {
- this.searchParams.pageNo = val
- setUrlParams(this.searchParams)
- this._debounceGET()
- },
_getList (flag) {
this.isLoading = !flag
this.getProjectsList(this.searchParams).then(res => {
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
index d9544f36c0..674d4e4510 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
@@ -26,7 +26,6 @@
import { mapActions } from 'vuex'
import mList from './_source/list'
import mSpin from '@/module/components/spin/spin'
- import { setUrlParams } from '@/module/util/routerUtil'
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -72,13 +71,10 @@
if (this.searchParams.taskName) {
this.searchParams.taskName = ''
}
- setUrlParams(this.searchParams)
- this._debounceGET()
+ this.searchParams.pageNo = 1
},
_page (val) {
this.searchParams.pageNo = val
- setUrlParams(this.searchParams)
- this._debounceGET()
},
/**
* get list data
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index d6811988b1..83672d005b 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -36,7 +36,6 @@
import mSpin from '@/module/components/spin/spin'
import { findComponentDownward } from '@/module/util/'
import mNoData from '@/module/components/noData/noData'
- import { setUrlParams } from '@/module/util/routerUtil'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -70,17 +69,12 @@
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
this.searchParams.pageNo = 1
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_page (val) {
this.searchParams.pageNo = val
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_getList (flag) {
this.isLoading = !flag
- this.fileResourcesList = []
this.getResourcesListP(this.searchParams).then(res => {
this.fileResourcesList = res.totalList
this.total = res.total
@@ -92,7 +86,6 @@
_updateList () {
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''
- setUrlParams(this.searchParams)
this._debounceGET()
}
},
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index b0fab036f4..8e99a0f92f 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -33,7 +33,6 @@
import mCreateUdf from './_source/createUdf'
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
- import { setUrlParams } from '@/module/util/routerUtil'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -60,13 +59,9 @@
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
this.searchParams.pageNo = 1
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_page (val) {
this.searchParams.pageNo = val
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_create () {
let self = this
@@ -96,13 +91,12 @@
_updateList () {
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''
- setUrlParams(this.searchParams)
this._debounceGET()
},
_getList (flag) {
this.isLoading = !flag
- this.udfFuncList = []
this.getUdfFuncListP(this.searchParams).then(res => {
+ this.udfFuncList = []
this.udfFuncList = res.totalList
this.total = res.total
this.isLoading = false
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index 6274d03c24..e9bef997ab 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -33,7 +33,6 @@
import mSpin from '@/module/components/spin/spin'
import { findComponentDownward } from '@/module/util/'
import mNoData from '@/module/components/noData/noData'
- import { setUrlParams } from '@/module/util/routerUtil'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -67,24 +66,19 @@
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
this.searchParams.pageNo = 1
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_page (val) {
this.searchParams.pageNo = val
- setUrlParams(this.searchParams)
- this._debounceGET()
},
_updateList () {
this.searchParams.pageNo = 1
this.searchParams.searchVal = ''
- setUrlParams(this.searchParams)
this._debounceGET()
},
_getList (flag) {
this.isLoading = !flag
- this.udfResourcesList = []
this.getResourcesListP(this.searchParams).then(res => {
+ this.udfResourcesList = []
this.udfResourcesList = res.totalList
this.total = res.total
this.isLoading = false
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
index 9cfa10105c..f65ab97d2c 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@@ -12,9 +12,9 @@
-
+
-
+
@@ -27,11 +27,13 @@