Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
三久
DolphinScheduler
提交
6dc8a4d3
DolphinScheduler
项目概览
三久
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6dc8a4d3
编写于
4月 17, 2019
作者:
G
gongzijian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
解决分页url带参数问题/创建用户增加队列
上级
4d9d72fe
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
191 addition
and
157 deletion
+191
-157
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
...ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+28
-23
escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
...ome/pages/projects/pages/_source/taskRecordList/index.vue
+1
-5
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
...home/pages/projects/pages/definition/pages/list/index.vue
+0
-5
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
...f/home/pages/projects/pages/instance/pages/list/index.vue
+3
-0
escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
...r-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+5
-8
escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
.../js/conf/home/pages/projects/pages/taskInstance/index.vue
+1
-5
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
.../conf/home/pages/resource/pages/file/pages/list/index.vue
+0
-7
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
...nf/home/pages/resource/pages/udf/pages/function/index.vue
+1
-7
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
...nf/home/pages/resource/pages/udf/pages/resource/index.vue
+1
-7
escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
...-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+25
-20
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
.../pages/security/pages/tenement/_source/createTenement.vue
+4
-4
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
.../src/js/conf/home/pages/security/pages/tenement/index.vue
+25
-21
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
...nf/home/pages/security/pages/users/_source/createUser.vue
+39
-2
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
.../js/conf/home/pages/security/pages/users/_source/list.vue
+4
-0
escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
...-ui/src/js/conf/home/pages/security/pages/users/index.vue
+25
-20
escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
...js/conf/home/pages/security/pages/warningGroups/index.vue
+25
-21
escheduler-ui/src/js/module/mixin/listUrlParamHandle.js
escheduler-ui/src/js/module/mixin/listUrlParamHandle.js
+3
-1
未找到文件。
escheduler-ui/.env
浏览文件 @
6dc8a4d3
# 后端接口地址
API_BASE = http://192.168.220.
154
:12345
API_BASE = http://192.168.220.
247
:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -9,9 +9,9 @@
</template>
<
template
slot=
"content"
>
<template
v-if=
"datasourcesList.length"
>
<m-list
:datasources-list=
"datasourcesList"
:page-no=
"
pageNo"
:page-size=
"
pageSize"
></m-list>
<m-list
:datasources-list=
"datasourcesList"
:page-no=
"
searchParams.pageNo"
:page-size=
"searchParams.
pageSize"
></m-list>
<div
class=
"page-box"
>
<x-page
:current=
"pa
geNo"
:total=
"total
"
show-elevator
@
on-change=
"_page"
></x-page>
<x-page
:current=
"pa
rseInt(searchParams.pageNo)"
:total=
"total"
:page-size=
"searchParams.pageSize
"
show-elevator
@
on-change=
"_page"
></x-page>
</div>
</
template
>
<
template
v-if=
"!datasourcesList.length"
>
...
...
@@ -23,11 +23,13 @@
</m-list-construction>
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
mCreateDataSource
from
'
./_source/createDataSource
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
...
...
@@ -37,18 +39,21 @@
return
{
// loading
isLoading
:
true
,
// Number of pages per page
pageSize
:
10
,
// Number of pages
pageNo
:
1
,
// Total number of articles
total
:
20
,
// Search value
searchVal
:
''
,
// data sources(List)
datasourcesList
:
[]
datasourcesList
:
[],
searchParams
:
{
// Number of pages per page
pageSize
:
10
,
// Number of pages
pageNo
:
1
,
// Search value
searchVal
:
''
}
}
},
mixins
:
[
listUrlParamHandle
],
props
:
{},
methods
:
{
...
mapActions
(
'
datasource
'
,
[
'
getDatasourcesListP
'
]),
...
...
@@ -67,7 +72,7 @@
return
h
(
mCreateDataSource
,
{
on
:
{
onUpdate
()
{
self
.
_
getDatasourcesListP
(
'
false
'
)
self
.
_
debounceGET
(
'
false
'
)
modal
.
remove
()
},
close
()
{
...
...
@@ -85,27 +90,22 @@
* page
*/
_page
(
val
)
{
this
.
pageNo
=
val
this
.
_getDatasourcesListP
()
this
.
searchParams
.
pageNo
=
val
},
/**
* conditions event
*/
_onConditions
(
o
)
{
this
.
searchVal
=
o
.
searchVal
this
.
pageNo
=
1
this
.
_getDatasourcesListP
(
'
false
'
)
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
this
.
searchParams
.
pageNo
=
1
},
/**
* get data(List)
*/
_get
DatasourcesListP
(
flag
)
{
_get
List
(
flag
)
{
this
.
isLoading
=
!
flag
this
.
getDatasourcesListP
({
pageSize
:
this
.
pageSize
,
pageNo
:
this
.
pageNo
,
searchVal
:
this
.
searchVal
}).
then
(
res
=>
{
this
.
getDatasourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
datasourcesList
=
[]
this
.
datasourcesList
=
res
.
totalList
this
.
total
=
res
.
total
this
.
isLoading
=
false
...
...
@@ -114,9 +114,14 @@
})
}
},
watch
:
{},
watch
:
{
// router
'
$route
'
(
a
)
{
// url no params get instance list
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
this
.
_getDatasourcesListP
()
},
mounted
()
{
},
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -27,7 +27,6 @@
import
store
from
'
@/conf/home/store
'
import
mConditions
from
'
./_source/conditions
'
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
'
...
...
@@ -61,13 +60,10 @@
methods
:
{
_onQuery
(
o
)
{
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
setUrlParams
(
this
.
searchParams
)
this
.
_debounceGET
()
this
.
searchParams
.
pageNo
=
1
},
_page
(
val
)
{
this
.
searchParams
.
pageNo
=
val
setUrlParams
(
this
.
searchParams
)
this
.
_debounceGET
()
},
/**
* get list data
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -30,7 +30,6 @@
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
localStore
from
'
@/module/util/localStorage
'
import
{
setUrlParams
}
from
'
@/module/util/routerUtil
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
...
...
@@ -62,8 +61,6 @@
*/
_page
(
val
)
{
this
.
searchParams
.
pageNo
=
val
setUrlParams
(
this
.
searchParams
)
this
.
_debounceGET
()
},
/**
* conditions
...
...
@@ -71,8 +68,6 @@
_onConditions
(
o
)
{
this
.
searchParams
.
searchVal
=
o
.
searchVal
this
.
searchParams
.
pageNo
=
1
setUrlParams
(
this
.
searchParams
)
this
.
_debounceGET
()
},
/**
* get data list
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -162,3 +162,6 @@
components
:
{
mList
,
mInstanceConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
}
</
script
>
<
style
lang=
"scss"
rel=
"stylesheet/scss"
>
</
style
>
escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -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
=>
{
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -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
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -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
()
}
},
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -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
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -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
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -12,9 +12,9 @@
</template>
<
template
slot=
"content"
>
<template
v-if=
"queueList.length"
>
<m-list
:queue-list=
"queueList"
:page-no=
"
pageNo"
:page-size=
"
pageSize"
></m-list>
<m-list
:queue-list=
"queueList"
:page-no=
"
searchParams.pageNo"
:page-size=
"searchParams.
pageSize"
></m-list>
<div
class=
"page-box"
>
<x-page
:current=
"pa
geNo"
:total=
"total
"
show-elevator
@
on-change=
"_page"
></x-page>
<x-page
:current=
"pa
rseInt(searchParams.pageNo)"
:total=
"total"
:page-size=
"searchParams.pageSize
"
show-elevator
@
on-change=
"_page"
></x-page>
</div>
</
template
>
<
template
v-if=
"!queueList.length"
>
...
...
@@ -27,11 +27,13 @@
</div>
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mCreateQueue
from
'
./_source/createQueue
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
import
mSecondaryMenu
from
'
@/module/components/secondaryMenu/secondaryMenu
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
...
...
@@ -40,14 +42,17 @@
name
:
'
queue-index
'
,
data
()
{
return
{
pageSize
:
10
,
pageNo
:
1
,
total
:
null
,
searchVal
:
''
,
isLoading
:
true
,
queueList
:
[]
queueList
:
[],
searchParams
:
{
pageSize
:
10
,
pageNo
:
1
,
searchVal
:
''
}
}
},
mixins
:
[
listUrlParamHandle
],
props
:
{},
methods
:
{
...
mapActions
(
'
security
'
,
[
'
getQueueListP
'
]),
...
...
@@ -55,13 +60,11 @@
* Query
*/
_onConditions
(
o
)
{
this
.
searchVal
=
o
.
searchVal
this
.
pageNo
=
1
this
.
_getQueueListP
()
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
this
.
searchParams
.
pageNo
=
1
},
_page
(
val
)
{
this
.
pageNo
=
val
this
.
_getQueueListP
()
this
.
searchParams
.
pageNo
=
val
},
_create
(
item
)
{
let
self
=
this
...
...
@@ -75,7 +78,7 @@
return
h
(
mCreateQueue
,
{
on
:
{
onUpdate
()
{
self
.
_
getQueueListP
(
'
false
'
)
self
.
_
debounceGET
(
'
false
'
)
modal
.
remove
()
},
close
()
{
...
...
@@ -89,13 +92,10 @@
}
})
},
_get
QueueListP
(
flag
)
{
_get
List
(
flag
)
{
this
.
isLoading
=
!
flag
this
.
getQueueListP
({
pageSize
:
this
.
pageSize
,
pageNo
:
this
.
pageNo
,
searchVal
:
this
.
searchVal
}).
then
(
res
=>
{
this
.
getQueueListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
queueList
=
[]
this
.
queueList
=
res
.
totalList
this
.
total
=
res
.
total
this
.
isLoading
=
false
...
...
@@ -104,9 +104,14 @@
})
}
},
watch
:
{},
watch
:
{
// router
'
$route
'
(
a
)
{
// url no params get instance list
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
this
.
_getQueueListP
()
},
mounted
()
{
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
浏览文件 @
6dc8a4d3
...
...
@@ -157,19 +157,19 @@
watch
:
{
},
created
()
{
},
mounted
()
{
this
.
_getQueueList
().
then
(
res
=>
{
if
(
this
.
item
)
{
this
.
$nextTick
(()
=>
{
this
.
queueId
=
_
.
fi
lter
(
this
.
queueList
,
v
=>
v
.
id
===
this
.
item
.
queueId
)[
0
]
this
.
queueId
=
_
.
fi
nd
(
this
.
queueList
,
[
'
id
'
,
this
.
item
.
queueId
])
})
this
.
tenantCode
=
this
.
item
.
tenantCode
this
.
tenantName
=
this
.
item
.
tenantName
this
.
desc
=
this
.
item
.
desc
}
})
},
mounted
()
{
},
components
:
{
mPopup
,
mListBoxF
}
}
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -12,9 +12,9 @@
</template>
<
template
slot=
"content"
>
<template
v-if=
"tenementList.length"
>
<m-list
:tenement-list=
"tenementList"
:page-no=
"
pageNo"
:page-size=
"
pageSize"
></m-list>
<m-list
:tenement-list=
"tenementList"
:page-no=
"
searchParams.pageNo"
:page-size=
"searchParams.
pageSize"
></m-list>
<div
class=
"page-box"
>
<x-page
:current=
"pa
geNo"
:total=
"total
"
show-elevator
@
on-change=
"_page"
></x-page>
<x-page
:current=
"pa
rseInt(searchParams.pageNo)"
:total=
"total"
:page-size=
"searchParams.pageSize
"
show-elevator
@
on-change=
"_page"
></x-page>
</div>
</
template
>
<
template
v-if=
"!tenementList.length"
>
...
...
@@ -27,11 +27,13 @@
</div>
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mCreateTenement
from
'
./_source/createTenement
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
import
mSecondaryMenu
from
'
@/module/components/secondaryMenu/secondaryMenu
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
...
...
@@ -40,14 +42,17 @@
name
:
'
tenement-index
'
,
data
()
{
return
{
pageSize
:
10
,
pageNo
:
1
,
total
:
null
,
searchVal
:
''
,
isLoading
:
true
,
tenementList
:
[]
tenementList
:
[],
searchParams
:
{
pageSize
:
10
,
pageNo
:
1
,
searchVal
:
''
}
}
},
mixins
:
[
listUrlParamHandle
],
props
:
{},
methods
:
{
...
mapActions
(
'
security
'
,
[
'
getTenantListP
'
]),
...
...
@@ -55,13 +60,11 @@
* Query
*/
_onConditions
(
o
)
{
this
.
searchVal
=
o
.
searchVal
this
.
pageNo
=
1
this
.
_getTenantListP
()
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
this
.
searchParams
.
pageNo
=
1
},
_page
(
val
)
{
this
.
pageNo
=
val
this
.
_getTenantListP
()
this
.
searchParams
.
pageNo
=
val
},
_create
(
item
)
{
let
self
=
this
...
...
@@ -75,7 +78,7 @@
return
h
(
mCreateTenement
,
{
on
:
{
onUpdate
()
{
self
.
_
getTenantListP
(
'
false
'
)
self
.
_
debounceGET
(
'
false
'
)
modal
.
remove
()
},
close
()
{
...
...
@@ -89,13 +92,10 @@
}
})
},
_get
TenantListP
(
flag
)
{
_get
List
(
flag
)
{
this
.
isLoading
=
!
flag
this
.
getTenantListP
({
pageSize
:
this
.
pageSize
,
pageNo
:
this
.
pageNo
,
searchVal
:
this
.
searchVal
}).
then
(
res
=>
{
this
.
getTenantListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
tenementList
=
[]
this
.
tenementList
=
res
.
totalList
this
.
total
=
res
.
total
this
.
isLoading
=
false
...
...
@@ -104,12 +104,16 @@
})
}
},
watch
:
{},
watch
:
{
// router
'
$route
'
(
a
)
{
// url no params get instance list
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
this
.
_getTenantListP
()
},
mounted
()
{
},
components
:
{
mSecondaryMenu
,
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
浏览文件 @
6dc8a4d3
...
...
@@ -39,6 +39,19 @@
</x-select>
</
template
>
</m-list-box-f>
<m-list-box-f>
<
template
slot=
"name"
><b>
*
</b>
{{
$t
(
'
Queue
'
)
}}
</
template
>
<
template
slot=
"content"
>
<x-select
v-model=
"queueName"
>
<x-option
v-for=
"city in queueList"
:key=
"city.id"
:value=
"city"
:label=
"city.code"
>
</x-option>
</x-select>
</
template
>
</m-list-box-f>
<m-list-box-f>
<
template
slot=
"name"
><b>
*
</b>
{{
$t
(
'
Email
'
)
}}
</
template
>
<
template
slot=
"content"
>
...
...
@@ -77,9 +90,11 @@
return
{
store
,
router
,
queueList
:
[],
userName
:
''
,
userPassword
:
''
,
tenantId
:
{},
queueName
:
{},
email
:
''
,
phone
:
''
,
tenantList
:
[],
...
...
@@ -144,6 +159,22 @@
return
true
},
_getQueueList
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
store
.
dispatch
(
'
security/getQueueList
'
).
then
(
res
=>
{
this
.
queueList
=
_
.
map
(
res
,
v
=>
{
return
{
id
:
v
.
id
,
code
:
v
.
queueName
}
})
this
.
$nextTick
(()
=>
{
this
.
queueName
=
this
.
queueList
[
0
]
})
resolve
()
})
})
},
_getTenantList
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
store
.
dispatch
(
'
security/getTenantList
'
).
then
(
res
=>
{
...
...
@@ -167,6 +198,7 @@
userPassword
:
this
.
userPassword
,
tenantId
:
this
.
tenantId
.
id
,
email
:
this
.
email
,
queue
:
this
.
queueName
.
code
,
phone
:
this
.
phone
}
if
(
this
.
item
)
{
...
...
@@ -188,13 +220,16 @@
created
()
{
// Administrator gets tenant list
if
(
this
.
isADMIN
)
{
this
.
_getTenantList
().
then
(
res
=>
{
Promise
.
all
([
this
.
_getQueueList
(),
this
.
_getTenantList
()]).
then
(()
=>
{
if
(
this
.
item
)
{
this
.
userName
=
this
.
item
.
userName
this
.
userPassword
=
''
this
.
email
=
this
.
item
.
email
this
.
phone
=
this
.
item
.
phone
this
.
tenantId
=
_
.
filter
(
this
.
tenantList
,
v
=>
v
.
id
===
this
.
item
.
tenantId
)[
0
]
this
.
tenantId
=
_
.
find
(
this
.
tenantList
,
[
'
id
'
,
this
.
item
.
tenantId
])
this
.
$nextTick
(()
=>
{
this
.
queueName
=
_
.
find
(
this
.
queueList
,
[
'
code
'
,
this
.
item
.
queue
])
})
}
})
}
else
{
...
...
@@ -204,10 +239,12 @@
this
.
email
=
this
.
item
.
email
this
.
phone
=
this
.
item
.
phone
this
.
tenantId
.
id
=
this
.
item
.
tenantId
this
.
queueName
=
{
queue
:
this
.
item
.
queue
}
}
}
},
mounted
()
{
},
components
:
{
mPopup
,
mListBoxF
}
}
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
浏览文件 @
6dc8a4d3
...
...
@@ -12,6 +12,9 @@
<th>
<span>
{{
$t
(
'
Tenant
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Queue
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Email
'
)
}}
</span>
</th>
...
...
@@ -38,6 +41,7 @@
</span>
</td>
<td><span>
{{
item
.
tenantName
||
'
-
'
}}
</span></td>
<td><span>
{{
item
.
queue
||
'
-
'
}}
</span></td>
<td>
<span>
{{
item
.
email
||
'
-
'
}}
</span>
</td>
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -12,9 +12,9 @@
</template>
<
template
slot=
"content"
>
<template
v-if=
"userList.length"
>
<m-list
:user-list=
"userList"
:page-no=
"
pageNo"
:page-size=
"
pageSize"
></m-list>
<m-list
:user-list=
"userList"
:page-no=
"
searchParams.pageNo"
:page-size=
"searchParams.
pageSize"
></m-list>
<div
class=
"page-box"
>
<x-page
:current=
"pa
geNo"
:total=
"total
"
show-elevator
@
on-change=
"_page"
></x-page>
<x-page
:current=
"pa
rseInt(searchParams.pageNo)"
:total=
"total"
:page-size=
"searchParams.pageSize
"
show-elevator
@
on-change=
"_page"
></x-page>
</div>
</
template
>
<
template
v-if=
"!userList.length"
>
...
...
@@ -27,11 +27,13 @@
</div>
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mCreateUser
from
'
./_source/createUser
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
import
mSecondaryMenu
from
'
@/module/components/secondaryMenu/secondaryMenu
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
...
...
@@ -40,14 +42,17 @@
name
:
'
users-index
'
,
data
()
{
return
{
pageSize
:
10
,
pageNo
:
1
,
total
:
null
,
searchVal
:
''
,
isLoading
:
true
,
userList
:
[]
userList
:
[],
searchParams
:
{
pageSize
:
10
,
pageNo
:
1
,
searchVal
:
''
}
}
},
mixins
:
[
listUrlParamHandle
],
props
:
{},
methods
:
{
...
mapActions
(
'
security
'
,
[
'
getUsersList
'
]),
...
...
@@ -55,13 +60,11 @@
* Query
*/
_onConditions
(
o
)
{
this
.
searchVal
=
o
.
searchVal
this
.
pageNo
=
1
this
.
_getUsersListP
()
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
this
.
searchParams
.
pageNo
=
1
},
_page
(
val
)
{
this
.
pageNo
=
val
this
.
_getUsersListP
()
this
.
searchParams
.
pageNo
=
val
},
_create
(
item
)
{
let
self
=
this
...
...
@@ -75,7 +78,7 @@
return
h
(
mCreateUser
,
{
on
:
{
onUpdate
()
{
self
.
_
getUsersListP
(
'
false
'
)
self
.
_
debounceGET
(
'
false
'
)
modal
.
remove
()
},
close
()
{
...
...
@@ -89,13 +92,10 @@
}
})
},
_get
UsersListP
(
flag
)
{
_get
List
(
flag
)
{
this
.
isLoading
=
!
flag
this
.
getUsersList
({
pageSize
:
this
.
pageSize
,
pageNo
:
this
.
pageNo
,
searchVal
:
this
.
searchVal
}).
then
(
res
=>
{
this
.
getUsersList
(
this
.
searchParams
).
then
(
res
=>
{
this
.
userList
=
[]
this
.
userList
=
res
.
totalList
this
.
total
=
res
.
total
this
.
isLoading
=
false
...
...
@@ -104,9 +104,14 @@
})
}
},
watch
:
{},
watch
:
{
// router
'
$route
'
(
a
)
{
// url no params get instance list
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
this
.
_getUsersListP
()
},
mounted
()
{
},
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
浏览文件 @
6dc8a4d3
...
...
@@ -12,10 +12,9 @@
</template>
<
template
slot=
"content"
>
<template
v-if=
"alertgroupList.length"
>
<m-list
:alertgroup-list=
"alertgroupList"
:page-no=
"
pageNo"
:page-size=
"
pageSize"
></m-list>
<m-list
:alertgroup-list=
"alertgroupList"
:page-no=
"
searchParams.pageNo"
:page-size=
"searchParams.
pageSize"
></m-list>
<div
class=
"page-box"
>
<x-page
:current=
"pageNo"
:total=
"total"
show-elevator
@
on-change=
"_page"
></x-page>
<x-page
:current=
"parseInt(searchParams.pageNo)"
:total=
"total"
:page-size=
"searchParams.pageSize"
show-elevator
@
on-change=
"_page"
></x-page>
</div>
</
template
>
<
template
v-if=
"!alertgroupList.length"
>
...
...
@@ -28,11 +27,13 @@
</div>
</template>
<
script
>
import
_
from
'
lodash
'
import
{
mapActions
}
from
'
vuex
'
import
mList
from
'
./_source/list
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mCreateWarning
from
'
./_source/createWarning
'
import
mNoData
from
'
@/module/components/noData/noData
'
import
listUrlParamHandle
from
'
@/module/mixin/listUrlParamHandle
'
import
mConditions
from
'
@/module/components/conditions/conditions
'
import
mSecondaryMenu
from
'
@/module/components/secondaryMenu/secondaryMenu
'
import
mListConstruction
from
'
@/module/components/listConstruction/listConstruction
'
...
...
@@ -41,14 +42,17 @@
name
:
'
warning-groups-index
'
,
data
()
{
return
{
pageSize
:
10
,
pageNo
:
1
,
total
:
null
,
searchVal
:
''
,
isLoading
:
false
,
alertgroupList
:
[]
alertgroupList
:
[],
searchParams
:
{
pageSize
:
10
,
pageNo
:
1
,
searchVal
:
''
}
}
},
mixins
:
[
listUrlParamHandle
],
props
:
{},
methods
:
{
...
mapActions
(
'
security
'
,
[
'
getAlertgroupP
'
]),
...
...
@@ -56,13 +60,11 @@
* Inquire
*/
_onConditions
(
o
)
{
this
.
searchVal
=
o
.
searchVal
this
.
pageNo
=
1
this
.
_getAlertgroupP
()
this
.
searchParams
=
_
.
assign
(
this
.
searchParams
,
o
)
this
.
searchParams
.
pageNo
=
1
},
_page
(
val
)
{
this
.
pageNo
=
val
this
.
_getAlertgroupP
()
this
.
searchParams
.
pageNo
=
val
},
_create
(
item
)
{
let
self
=
this
...
...
@@ -76,7 +78,7 @@
return
h
(
mCreateWarning
,
{
on
:
{
onUpdate
()
{
self
.
_
getAlertgroupP
(
'
false
'
)
self
.
_
debounceGET
(
'
false
'
)
modal
.
remove
()
},
close
()
{
...
...
@@ -90,13 +92,10 @@
}
})
},
_get
AlertgroupP
(
flag
)
{
_get
List
(
flag
)
{
this
.
isLoading
=
!
flag
this
.
getAlertgroupP
({
pageSize
:
this
.
pageSize
,
pageNo
:
this
.
pageNo
,
searchVal
:
this
.
searchVal
}).
then
(
res
=>
{
this
.
getAlertgroupP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
alertgroupList
=
[]
this
.
alertgroupList
=
res
.
totalList
this
.
total
=
res
.
total
this
.
isLoading
=
false
...
...
@@ -105,9 +104,14 @@
})
}
},
watch
:
{},
watch
:
{
// router
'
$route
'
(
a
)
{
// url no params get instance list
this
.
searchParams
.
pageNo
=
_
.
isEmpty
(
a
.
query
)
?
1
:
a
.
query
.
pageNo
}
},
created
()
{
this
.
_getAlertgroupP
()
},
mounted
()
{
},
...
...
escheduler-ui/src/js/module/mixin/listUrlParamHandle.js
浏览文件 @
6dc8a4d3
...
...
@@ -15,6 +15,7 @@
* limitations under the License.
*/
import
_
from
'
lodash
'
import
{
setUrlParams
}
from
'
@/module/util/routerUtil
'
/**
* Mainly used for data list paging url param handle
* @param _getList => api function(required)
...
...
@@ -22,9 +23,10 @@ import _ from 'lodash'
export
default
{
watch
:
{
// watch pageNo
'
searchParams
.pageNo
'
:
{
'
searchParams
'
:
{
deep
:
true
,
handler
()
{
setUrlParams
(
this
.
searchParams
)
this
.
_debounceGET
()
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录