Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ETL-admin
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
莫晓莉
ETL-admin
Commits
b36ea399
Commit
b36ea399
authored
Apr 28, 2021
by
莫晓莉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
执行作业,区分了转换和任务,任务是有弹窗,启动执行显示日志和作业度量
parent
48317d5d
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
79 additions
and
24 deletions
+79
-24
src/api/kettle/file.js
+38
-0
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
+35
-24
src/views/dialogs-components/global/job-run-result/index.js
+3
-0
src/views/dialogs-components/global/job-run-result/main.vue
+0
-0
src/views/dialogs-components/global/job-run/index.js
+3
-0
src/views/dialogs-components/global/job-run/main.vue
+0
-0
No files found.
src/api/kettle/file.js
View file @
b36ea399
...
...
@@ -254,6 +254,35 @@ export function doTrans(data) {
method
:
'post'
})
}
// 执行作业转换
export
function
initRun
(
data
)
{
return
request
({
url
:
'etlweb/job/initRun'
,
data
,
method
:
'post'
})
}
// 执行作业--1
export
function
jobRun
(
data
)
{
return
request
({
url
:
'etlweb/job/run'
,
data
,
method
:
'post'
})
}
// 执行作业--2
export
function
jobResult
(
data
)
{
return
request
({
url
:
'etlweb/job/result'
,
data
,
method
:
'post'
})
}
//删除资源库
export
function
drop
(
data
)
{
return
request
({
...
...
@@ -310,6 +339,15 @@ export function getVariableType(data) {
method
:
'post'
})
}
// 获取Starting point of job
export
function
getEntries
(
data
)
{
return
request
({
url
:
'etlweb/job/entries'
,
data
,
method
:
'post'
})
}
...
...
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
View file @
b36ea399
...
...
@@ -915,6 +915,10 @@
<server-dialog
ref=
"myServer"
:serverDialogVisible
.
sync=
"serverDialogVisible"
></server-dialog>
<!-- 子服务器结束 -->
<!-- 执行作业开始 -->
<job-run
ref=
"jobRun"
:jobRunVisible
.
sync=
"jobRunVisible"
:saveOutputDialog=
"saveOutputDialog"
:doubleClickCell=
"doubleClickCell"
></job-run>
<!-- 执行作业结束 -->
...
...
@@ -1022,6 +1026,7 @@ export default {
data
()
{
return
{
jobRunVisible
:
false
,
//作业转换弹窗
serverDialogVisible
:
false
,
//子服务器弹窗
curFileType
:
"transformation"
,
//当前点击的文件的类型,默认是转换文件--mxl
nodeData
:[],
...
...
@@ -1207,8 +1212,8 @@ export default {
watch
:
{
blankCanvas
(
n
,
o
)
{
this
.
monitorCanvas
=
n
;
//
this.setShowXml();
this
.
setXml
();
this
.
setShowXml
();
//
this.setXml();
this
.
getXml
();
},
// blankCanvas:{
...
...
@@ -1244,27 +1249,27 @@ export default {
methods
:
{
//
setShowXml() {
//
this.graph.getModel().beginUpdate();
//
try {
//
var doc = mxUtils.parseXml(decodeURIComponent(this.blankCanvas));
//
var codec = new mxCodec(doc);
//
var style = new Object();
//
style[mxConstants.STYLE_SHAPE] = mxConstants.SHAPE_IMAGE;
//
style[mxConstants.STYLE_PERIMETER] = mxPerimeter.RectanglePerimeter;
//
style[mxConstants.STYLE_IMAGE] = 'editors/images/bigicon/start_event_empty.png';
//
style[mxConstants.STYLE_IMAGE_WIDTH] = '48';
//
style[mxConstants.STYLE_IMAGE_HEIGHT] = '48';
//
style[mxConstants.STYLE_FONTCOLOR] = '#000000';
//
style[mxConstants.STYLE_VERTICAL_LABEL_POSITION] = mxConstants.ALIGN_CENTER;
//
this.graph.getStylesheet().putCellStyle('start-s', style);
//
codec.decode(doc.documentElement, this.graph.getModel());
//
} finally {
//
this.graph.getModel().endUpdate();
//
}
//
},
setShowXml
()
{
this
.
graph
.
getModel
().
beginUpdate
();
try
{
var
doc
=
mxUtils
.
parseXml
(
decodeURIComponent
(
this
.
blankCanvas
));
var
codec
=
new
mxCodec
(
doc
);
var
style
=
new
Object
();
style
[
mxConstants
.
STYLE_SHAPE
]
=
mxConstants
.
SHAPE_IMAGE
;
style
[
mxConstants
.
STYLE_PERIMETER
]
=
mxPerimeter
.
RectanglePerimeter
;
style
[
mxConstants
.
STYLE_IMAGE
]
=
'editors/images/bigicon/start_event_empty.png'
;
style
[
mxConstants
.
STYLE_IMAGE_WIDTH
]
=
'48'
;
style
[
mxConstants
.
STYLE_IMAGE_HEIGHT
]
=
'48'
;
style
[
mxConstants
.
STYLE_FONTCOLOR
]
=
'#000000'
;
style
[
mxConstants
.
STYLE_VERTICAL_LABEL_POSITION
]
=
mxConstants
.
ALIGN_CENTER
;
this
.
graph
.
getStylesheet
().
putCellStyle
(
'start-s'
,
style
);
codec
.
decode
(
doc
.
documentElement
,
this
.
graph
.
getModel
());
}
finally
{
this
.
graph
.
getModel
().
endUpdate
();
}
},
getTheField
(){
this
.
form
.
file
=
JSON
.
stringify
(
this
.
file
)
...
...
@@ -1664,7 +1669,7 @@ previousField(){
console
.
log
(
jsonArray
,
'jsonArray'
);
jsonArray
.
forEach
(
img
=>
{
label
+=
'<img src="'
+
this
.
etlWeb
+
img
+
'" width="16" height="16" />'
;
label
+=
'<img src="'
+
img
+
'" width="16" height="16" />'
;
})
return
label
;
...
...
@@ -2479,8 +2484,14 @@ previousField(){
// 执行转换
doTrans
()
{
if
(
this
.
curFileType
==
"transformation"
){
this
.
transGraphVisible
=
!
this
.
transGraphVisible
;
this
.
$refs
.
transRef
.
clickFun
(
this
.
graph
);
}
else
if
(
this
.
curFileType
==
"job"
){
this
.
jobRunVisible
=!
this
.
jobRunVisible
;
this
.
$refs
.
jobRun
.
clickFun
(
this
.
graph
);
}
},
...
...
src/views/dialogs-components/global/job-run-result/index.js
0 → 100644
View file @
b36ea399
import
main
from
'./main.vue'
export
default
main
\ No newline at end of file
src/views/dialogs-components/global/job-run-result/main.vue
0 → 100644
View file @
b36ea399
This diff is collapsed.
Click to expand it.
src/views/dialogs-components/global/job-run/index.js
0 → 100644
View file @
b36ea399
import
main
from
'./main.vue'
export
default
main
\ No newline at end of file
src/views/dialogs-components/global/job-run/main.vue
0 → 100644
View file @
b36ea399
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment