Commit b36ea399 by 莫晓莉

执行作业,区分了转换和任务,任务是有弹窗,启动执行显示日志和作业度量

parent 48317d5d
...@@ -254,6 +254,35 @@ export function doTrans(data) { ...@@ -254,6 +254,35 @@ export function doTrans(data) {
method: 'post' 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) { export function drop(data) {
return request({ return request({
...@@ -310,6 +339,15 @@ export function getVariableType(data) { ...@@ -310,6 +339,15 @@ export function getVariableType(data) {
method: 'post' method: 'post'
}) })
} }
// 获取Starting point of job
export function getEntries(data) {
return request({
url: 'etlweb/job/entries',
data,
method: 'post'
})
}
......
...@@ -915,6 +915,10 @@ ...@@ -915,6 +915,10 @@
<server-dialog ref="myServer" :serverDialogVisible.sync="serverDialogVisible" ></server-dialog> <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 { ...@@ -1022,6 +1026,7 @@ export default {
data() { data() {
return { return {
jobRunVisible:false,//作业转换弹窗
serverDialogVisible:false,//子服务器弹窗 serverDialogVisible:false,//子服务器弹窗
curFileType:"transformation",//当前点击的文件的类型,默认是转换文件--mxl curFileType:"transformation",//当前点击的文件的类型,默认是转换文件--mxl
nodeData:[], nodeData:[],
...@@ -1207,8 +1212,8 @@ export default { ...@@ -1207,8 +1212,8 @@ export default {
watch: { watch: {
blankCanvas(n, o) { blankCanvas(n, o) {
this.monitorCanvas = n; this.monitorCanvas = n;
// this.setShowXml(); this.setShowXml();
this.setXml(); // this.setXml();
this.getXml(); this.getXml();
}, },
// blankCanvas:{ // blankCanvas:{
...@@ -1244,27 +1249,27 @@ export default { ...@@ -1244,27 +1249,27 @@ export default {
methods: { methods: {
// setShowXml() { setShowXml() {
// this.graph.getModel().beginUpdate(); this.graph.getModel().beginUpdate();
// try { try {
// var doc = mxUtils.parseXml(decodeURIComponent(this.blankCanvas)); var doc = mxUtils.parseXml(decodeURIComponent(this.blankCanvas));
// var codec = new mxCodec(doc); var codec = new mxCodec(doc);
// var style = new Object(); var style = new Object();
// style[mxConstants.STYLE_SHAPE] = mxConstants.SHAPE_IMAGE; style[mxConstants.STYLE_SHAPE] = mxConstants.SHAPE_IMAGE;
// style[mxConstants.STYLE_PERIMETER] = mxPerimeter.RectanglePerimeter; style[mxConstants.STYLE_PERIMETER] = mxPerimeter.RectanglePerimeter;
// style[mxConstants.STYLE_IMAGE] = 'editors/images/bigicon/start_event_empty.png'; style[mxConstants.STYLE_IMAGE] = 'editors/images/bigicon/start_event_empty.png';
// style[mxConstants.STYLE_IMAGE_WIDTH] = '48'; style[mxConstants.STYLE_IMAGE_WIDTH] = '48';
// style[mxConstants.STYLE_IMAGE_HEIGHT] = '48'; style[mxConstants.STYLE_IMAGE_HEIGHT] = '48';
// style[mxConstants.STYLE_FONTCOLOR] = '#000000'; style[mxConstants.STYLE_FONTCOLOR] = '#000000';
// style[mxConstants.STYLE_VERTICAL_LABEL_POSITION] = mxConstants.ALIGN_CENTER; style[mxConstants.STYLE_VERTICAL_LABEL_POSITION] = mxConstants.ALIGN_CENTER;
// this.graph.getStylesheet().putCellStyle('start-s', style); this.graph.getStylesheet().putCellStyle('start-s', style);
// codec.decode(doc.documentElement, this.graph.getModel()); codec.decode(doc.documentElement, this.graph.getModel());
// } finally { } finally {
// this.graph.getModel().endUpdate(); this.graph.getModel().endUpdate();
// } }
// }, },
getTheField(){ getTheField(){
this.form.file = JSON.stringify(this.file) this.form.file = JSON.stringify(this.file)
...@@ -1664,7 +1669,7 @@ previousField(){ ...@@ -1664,7 +1669,7 @@ previousField(){
console.log(jsonArray,'jsonArray'); console.log(jsonArray,'jsonArray');
jsonArray.forEach(img=>{ jsonArray.forEach(img=>{
label += '<img src="'+this.etlWeb + img + '" width="16" height="16" />'; label += '<img src="'+img + '" width="16" height="16" />';
}) })
return label; return label;
...@@ -2479,8 +2484,14 @@ previousField(){ ...@@ -2479,8 +2484,14 @@ previousField(){
// 执行转换 // 执行转换
doTrans() { doTrans() {
this.transGraphVisible = !this.transGraphVisible; if(this.curFileType=="transformation"){
this.$refs.transRef.clickFun(this.graph); 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);
}
}, },
......
import main from './main.vue'
export default main
\ No newline at end of file
import main from './main.vue'
export default main
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment