Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
d86a4bed
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
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,发现更多精彩内容 >>
提交
d86a4bed
编写于
4月 24, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415
上级
8a1db01a
d750de3f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
87 addition
and
40 deletion
+87
-40
escheduler-ui/.env
escheduler-ui/.env
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
...rc/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+10
-0
escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js
...nf/home/pages/projects/pages/index/_source/chartConfig.js
+33
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue
.../home/pages/projects/pages/index/_source/projectChart.vue
+43
-38
未找到文件。
escheduler-ui/.env
浏览文件 @
d86a4bed
# 后端接口地址
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/dag/_source/formModel/tasks/sql.vue
浏览文件 @
d86a4bed
...
...
@@ -236,6 +236,12 @@
editor
.
setValue
(
this
.
sql
)
return
editor
},
_getReceiver
()
{
this
.
store
.
dispatch
(
'
dag/getReceiver
'
,
{
processDefinitionId
:
this
.
item
.
id
}).
then
(
res
=>
{
this
.
receivers
=
res
.
receivers
&&
res
.
receivers
.
split
(
'
,
'
)
||
[]
this
.
receiversCc
=
res
.
receiversCc
&&
res
.
receiversCc
.
split
(
'
,
'
)
||
[]
})
}
},
watch
:
{
...
...
@@ -280,6 +286,10 @@
this
.
receivers
=
o
.
params
.
receivers
&&
o
.
params
.
receivers
.
split
(
'
,
'
)
||
[]
this
.
receiversCc
=
o
.
params
.
receiversCc
&&
o
.
params
.
receiversCc
.
split
(
'
,
'
)
||
[]
}
//
if
(
this
.
router
.
history
.
current
.
name
===
'
definition-create
'
)
{
this
.
_getReceiver
()
}
},
mounted
()
{
setTimeout
(()
=>
{
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js
浏览文件 @
d86a4bed
...
...
@@ -15,6 +15,9 @@
* limitations under the License.
*/
import
_
from
'
lodash
'
import
{
tasksState
}
from
'
@/conf/home/pages/dag/_source/config
'
let
pie
=
{
series
:
[
{
...
...
@@ -63,4 +66,33 @@ let bar = {
}]
}
export
{
pie
,
bar
}
let
simple
=
{
xAxis
:
{
splitLine
:
{
show
:
false
},
axisLabel
:
{
interval
:
0
,
showMaxLabel
:
true
,
formatter
(
v
)
{
return
tasksState
[
v
].
desc
}
}
},
tooltip
:
{
formatter
(
data
)
{
let
str
=
''
_
.
map
(
data
,
(
v
,
i
)
=>
{
if
(
i
===
0
)
{
str
+=
`
${
tasksState
[
v
.
name
].
desc
}
<br>`
}
str
+=
`<div style="font-size: 12px;">
${
v
.
seriesName
}
:
${
v
.
data
}
<br></div>`
})
return
str
}
}
}
export
{
pie
,
bar
,
simple
}
escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue
浏览文件 @
d86a4bed
...
...
@@ -73,34 +73,7 @@
</div>
<div
class=
"row"
style=
"padding-top: 20px;"
>
<div
class=
"col-md-6"
>
<div
class=
"chart-title"
>
<span>
命令状态统计
</span>
</div>
<div
class=
"row"
>
<div
class=
"col-md-7"
>
<div
id=
"command-state-pie"
style=
"height:260px;margin-top: 100px;"
></div>
</div>
<div
class=
"col-md-5"
>
<div
class=
"table-small-model"
>
<table>
<tr>
<th
width=
"40"
>
{{
$t
(
'
#
'
)
}}
</th>
<th>
{{
$t
(
'
Number
'
)
}}
</th>
<th>
{{
$t
(
'
State
'
)
}}
</th>
</tr>
<tr
v-for=
"(item,$index) in taskCtatusList"
>
<td><span>
{{
$index
+
1
}}
</span></td>
<td>
<span>
<a
href=
"javascript:"
@
click=
"id && _goTask(item.key)"
:class=
"id ?'links':''"
>
{{
item
.
value
}}
</a>
</span>
</td>
<td><span
class=
"ellipsis"
style=
"width: 98%;"
:title=
"item.key"
>
{{
item
.
key
}}
</span></td>
</tr>
</table>
</div>
</div>
</div>
</div>
<div
class=
"col-md-6"
>
<div
class=
"chart-title"
>
...
...
@@ -108,19 +81,19 @@
</div>
<div
class=
"row"
>
<div
class=
"col-md-7"
>
<div
id=
"
process-stat
e-pie"
style=
"height:260px;margin-top: 100px;"
></div>
<div
id=
"
queu
e-pie"
style=
"height:260px;margin-top: 100px;"
></div>
</div>
<div
class=
"col-md-5"
>
<div
class=
"table-small-model"
>
<table>
<tr>
<th
width=
"40"
>
{{
$t
(
'
#
'
)
}}
</th>
<th>
{{
$t
(
'
Number
'
)
}}
</th>
<th>
{{
$t
(
'
State
'
)
}}
</th>
<th>
等待执行任务
</th>
<th>
等待Kill任务
</th>
</tr>
<tr
v-for=
"(item,$index) in
processStat
eList"
>
<tr
v-for=
"(item,$index) in
queu
eList"
>
<td><span>
{{
$index
+
1
}}
</span></td>
<td><span><a
href=
"javascript:"
@
click=
"id && _goProcess(item.key)"
:class=
"id ?'links':''"
>
{{
item
.
value
}}
</a></span></td>
<td><span><a
href=
"javascript:"
>
{{
item
.
value
}}
</a></span></td>
<td><span
class=
"ellipsis"
style=
"width: 98%;"
:title=
"item.key"
>
{{
item
.
key
}}
</span></td>
</tr>
</table>
...
...
@@ -129,6 +102,16 @@
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"chart-title"
style=
"margin-bottom: 20px;margin-top: 30px"
>
<span>
命令状态统计
</span>
</div>
<div>
<div
id=
"command-state-bar"
style=
"height:500px"
></div>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"chart-title"
style=
"margin-bottom: -20px;margin-top: 30px"
>
...
...
@@ -150,7 +133,7 @@
import
_
from
'
lodash
'
import
dayjs
from
'
dayjs
'
import
{
mapActions
}
from
'
vuex
'
import
{
pie
,
bar
}
from
'
./chartConfig
'
import
{
pie
,
bar
,
simple
}
from
'
./chartConfig
'
import
Chart
from
'
~/@analysys/ana-charts
'
import
mSpin
from
'
@/module/components/spin/spin
'
import
mNoData
from
'
@/module/components/noData/noData
'
...
...
@@ -166,6 +149,7 @@
processStateList
:
[],
defineUserList
:
[],
commandStateList
:
[],
queueList
:
[],
searchParams
:
{
projectId
:
this
.
id
,
startDate
:
''
,
...
...
@@ -203,7 +187,6 @@
}
})
},
_handleTaskCtatus
(
res
)
{
let
data
=
res
.
data
.
taskCountDtos
this
.
taskCtatusList
=
_
.
map
(
data
,
v
=>
{
...
...
@@ -263,10 +246,32 @@
}
},
_handleCommandState
(
res
)
{
let
data
=
[]
_
.
forEach
(
res
.
data
,
(
v
,
i
)
=>
{
let
key
=
_
.
keys
(
v
)
if
(
key
[
0
]
===
'
errorCount
'
)
{
data
.
push
({
typeName
:
'
错误指令数
'
,
key
:
v
.
commandState
,
value
:
v
.
errorCount
})
}
})
_
.
forEach
(
res
.
data
,
(
v
,
i
)
=>
{
let
key
=
_
.
keys
(
v
)
if
(
key
[
1
]
===
'
normalCount
'
)
{
data
.
push
({
typeName
:
'
正常指令数
'
,
key
:
v
.
commandState
,
value
:
v
.
normalCount
})
}
})
const
myChart
=
Chart
.
bar
(
'
#command-state-bar
'
,
data
,
{
title
:
''
})
myChart
.
echart
.
setOption
(
simple
)
},
_handleQueue
(
res
)
{
_
.
forEach
(
res
.
data
,
(
v
,
k
)
=>
this
.
queueList
.
push
({
key
:
k
===
'
taskQueue
'
?
'
等待执行任务
'
:
'
等待kill任务
'
,
value
:
v
}))
const
myChart
=
Chart
.
pie
(
'
#queue-pie
'
,
this
.
queueList
,
{
title
:
''
})
myChart
.
echart
.
setOption
(
pie
)
},
_handleQueue
()
{},
_getData
(
is
=
true
)
{
this
.
isLoading
=
true
let
ioList
=
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录