Skip to content

E
ETL-admin
Commit 74cbec0a by 李耀琨
Options

解决冲突

parents f75d681c 4e9ff468
Showing with 86 additions and 64 deletions
.env.development
ENV = 'development' ENV = 'development'
#VUE_APP_BASE_API = 'http://147.1.3.180:9888/'
#VUE_APP_WS_API = 'ws://147.1.3.180:9888/'
VUE_APP_BASE_API = 'http://192.168.0.44:9888/'
VUE_APP_WS_API = 'ws://192.168.0.44:9888/'
......
src/views/dashboard-kettle/components/appBulletFrame/customConstant.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-tab-pane label="元数据"> <el-tab-pane label="元数据">
<el-button <el-button
size="small" size="small"
type="primary" type="text"
style="margin: 10px" style="margin: 10px"
@click="customClick(true)" @click="customClick(true)"
>添加元数据</el-button >添加元数据</el-button
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<el-tab-pane label="数据"> <el-tab-pane label="数据">
<el-button <el-button
size="small" size="small"
type="primary" type="text"
style="margin: 10px" style="margin: 10px"
@click="valueClick(true)" @click="valueClick(true)"
>添加数据</el-button >添加数据</el-button
......
src/views/dashboard-kettle/components/appBulletFrame/generatingRecords.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<el-card class="box-card"> <el-card class="box-card">
<el-button <el-button
size="small" size="small"
type="primary" type="text"
style="margin: 10px" style="margin: 10px"
@click="addField(true)" @click="addField(true)"
>添加字段</el-button >添加字段</el-button
......
src/views/dashboard-kettle/components/appBulletFrame/getSystemInformation.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</el-form> </el-form>
<el-form ref="form" :model="form" label-width="0px"> <el-form ref="form" :model="form" label-width="0px">
<el-button type="primary" @click="addSheet(true)" style="margin: 10px" <el-button type="text" @click="addSheet(true)" style="margin: 10px"
>添加字段</el-button >添加字段</el-button
> >
<el-form-item> <el-form-item>
......
src/views/dashboard-kettle/components/appBulletFrame/getVariable.vue
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" @click="fieldClick(true)">添加字段</el-button> <el-button type="text" @click="fieldClick(true)">添加字段</el-button>
<el-button type="primary" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="fields" style="width: 100%"> <el-table :data="fields" style="width: 100%">
<el-table-column prop="field_name" label="字段名称"> </el-table-column>g <el-table-column prop="field_name" label="字段名称"> </el-table-column>g
......
src/views/dashboard-kettle/components/appBulletFrame/mergeRecords.vue
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
{{"匹配的关键字："}} {{"匹配的关键字："}}
<br> <br>
<br> <br>
<el-button type="primary" @click="matchingFieldClick(true)" <el-button type="text" @click="matchingFieldClick(true)"
>添加字段</el-button >添加字段</el-button
> >
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
{{"数据字段:"}} {{"数据字段:"}}
<br> <br>
<br> <br>
<el-button type="primary" @click="fieldClick(true)" <el-button type="text" @click="fieldClick(true)"
>添加字段</el-button >添加字段</el-button
> >
......
src/views/dashboard-kettle/components/appBulletFrame/randomNumber.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</el-form> </el-form>
<el-form ref="form" :model="form" label-width="0px"> <el-form ref="form" :model="form" label-width="0px">
<el-button type="primary" @click="addSheet(true)" style="margin: 10px" <el-button type="text" @click="addSheet(true)" style="margin: 10px"
>添加字段</el-button >添加字段</el-button
> >
<el-form-item> <el-form-item>
......
src/views/dashboard-kettle/components/appBulletFrame/selectField.vue
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="选择和修改"> <el-tab-pane label="选择和修改">
<el-button type="primary" @click="selectModify(true)">添加字段</el-button> <el-button type="text" @click="selectModify(true)">添加字段</el-button>
<el-button type="primary" @click="selectModifyGetTheField">获取字段</el-button> <el-button type="text" @click="selectModifyGetTheField">获取字段</el-button>
<el-table :data="fields" style="width: 100%"> <el-table :data="fields" style="width: 100%">
<el-table-column prop="name" label="字段名称"> </el-table-column> <el-table-column prop="name" label="字段名称"> </el-table-column>
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="移除"> <el-tab-pane label="移除">
<el-button type="primary" @click="fieldClick(true)">添加字段</el-button> <el-button type="text" @click="fieldClick(true)">添加字段</el-button>
<el-button type="primary" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="remove" style="width: 100%"> <el-table :data="remove" style="width: 100%">
<el-table-column prop="name" label="字段名称"> </el-table-column> <el-table-column prop="name" label="字段名称"> </el-table-column>
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="元数据"> <el-tab-pane label="元数据">
<el-button type="primary" @click="metadata(true)">添加字段</el-button> <el-button type="text" @click="metadata(true)">添加字段</el-button>
<el-button type="primary" @click="metadataGetTheField">获取字段</el-button> <el-button type="text" @click="metadataGetTheField">获取字段</el-button>
<el-table :data="meta" style="width: 100%"> <el-table :data="meta" style="width: 100%">
<el-table-column prop="name" label="字段名称"> </el-table-column> <el-table-column prop="name" label="字段名称"> </el-table-column>
......
src/views/dashboard-kettle/components/appBulletFrame/setVariable.vue
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" @click="fieldClick(true)">添加字段</el-button> <el-button type="text" @click="fieldClick(true)">添加字段</el-button>
<el-button type="primary" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="fields" style="width: 100%"> <el-table :data="fields" style="width: 100%">
<el-table-column prop="field_name" label="字段名称"> </el-table-column>g <el-table-column prop="field_name" label="字段名称"> </el-table-column>g
......
src/views/dashboard-kettle/components/appBulletFrame/sortRecord.vue
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-card class="box-card"> <el-card class="box-card">
<el-button type="primary" @click="fieldClick(true)">添加字段</el-button> <el-button type="text" @click="fieldClick(true)">添加字段</el-button>
<el-button type="primary" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="fields" style="width: 100%"> <el-table :data="fields" style="width: 100%">
<el-table-column prop="name" label="字段名称"> </el-table-column>g <el-table-column prop="name" label="字段名称"> </el-table-column>g
......
src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
...@@ -398,7 +398,7 @@ export default { ...@@ -398,7 +398,7 @@ export default {
// this.fieldName = this.fieldName + element + "," // this.fieldName = this.fieldName + element + ","
if (!i == 0) { if (!i == 0) {
this.fieldName = this.fieldName + "," + element; this.fieldName = this.fieldName + "\n," + element;
} else { } else {
this.fieldName = element; this.fieldName = element;
} }
...@@ -406,7 +406,7 @@ export default { ...@@ -406,7 +406,7 @@ export default {
console.log(this.fieldName, 464564564); console.log(this.fieldName, 464564564);
} }
this.form.sql = `select ${this.fieldName} from ${this.tableDetails.nodeId}.${this.tableDetails.text}`; this.form.sql = `select `+"\n"+`${this.fieldName} `+"\n"+`from `+"\n"+`${this.tableDetails.nodeId}.${this.tableDetails.text}`;
}); });
}, },
......
src/views/dashboard-kettle/components/appBulletFrame/textFileInput.vue
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="过滤"> <el-tab-pane label="过滤">
<el-button type="primary" @click="filterClick(true)" <el-button type="text" @click="filterClick(true)"
>添加过滤字段</el-button >添加过滤字段</el-button
> >
...@@ -470,8 +470,8 @@ ...@@ -470,8 +470,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="字段"> <el-tab-pane label="字段">
<el-button type="primary" @click="fieldClick(true)">添加字段</el-button> <el-button type="text" @click="fieldClick(true)">添加字段</el-button>
<el-button type="primary" @click="getTheField">获取字段</el-button> <el-button type="text" @click="getTheField">获取字段</el-button>
<el-table :data="inputFields" style="width: 100%"> <el-table :data="inputFields" style="width: 100%">
<el-table-column prop="name" label="名称"> </el-table-column>g <el-table-column prop="name" label="名称"> </el-table-column>g
......
src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue
...@@ -1099,15 +1099,32 @@ ...@@ -1099,15 +1099,32 @@
></successDialog> ></successDialog>
<!-- 作业弹窗组件end-------------------------------------> <!-- 作业弹窗组件end------------------------------------->
<!-- 转换弹窗组件start333 ------------------------------> <!-- 流程弹窗组件start333 ------------------------------>
<switchDialog
ref="switch" <!-- 流程弹窗组件end33333------------------------------ -->
:switchVisible.sync="switchVisible"
<!-- 脚本弹窗组件start -->
<sqlScriptDialog
ref="script"
:scriptVisible.sync="scriptVisible"
:saveOutputDialog="saveOutputDialog" :saveOutputDialog="saveOutputDialog"
:doubleClickCell="doubleClickCell" :doubleClickCell="doubleClickCell"
:switchFormSend="outPutFormData15" :scriptFormSend="outPutFormData16"
></switchDialog> ></sqlScriptDialog>
<!-- 转换弹窗组件end33333------------------------------ --> <!-- 脚本弹窗组件end -->
<!-- 转换弹窗组件start -->
<columnChoose
ref="insertOrdate"
:columnVisible.sync="columnVisible"
:saveOutputDialog="saveOutputDialog"
:doubleClickCell="doubleClickCell"
:getXmlVal="getXmlVal"
:insertOrUpdateFormSend="outPutFormData2"
></columnChoose>
<!-- 转换弹窗组件end -->
<!-- 执行转换开始 --> <!-- 执行转换开始 -->
<trans-graph <trans-graph
...@@ -1208,9 +1225,16 @@ import homeworkDialog from "../../../job-dialog/homework"; ...@@ -1208,9 +1225,16 @@ import homeworkDialog from "../../../job-dialog/homework";
// 流程弹窗组件start3333-------------------- // 流程弹窗组件start3333--------------------
import switchDialog from "../../../stream-dialog/switch"; import switchDialog from "../../../stream-dialog/switch";
// 流程弹窗组件end3333333333---------------- // 流程弹窗组件end3333333333----------------
// 脚本弹窗组件start---------------------
import sqlScriptDialog from "../../../script-dialog/sql-script";
// 脚本弹窗组件end-----------------------
// 转换弹窗组件start----------
import columnChoose from "../../../trans-dialog/column-choose";
// 转换弹窗组件end------------
import mxgraph from "@/utils/mxgraph"; import mxgraph from "@/utils/mxgraph";
const { const {
...@@ -1264,10 +1288,11 @@ export default { ...@@ -1264,10 +1288,11 @@ export default {
outPutFormData14: {}, //作业---成功 outPutFormData14: {}, //作业---成功
outPutFormData: {}, //输出弹窗组件的表单值 outPutFormData: {}, //输出弹窗组件的表单值
// 转换33start--------- // 转换33start---------
outPutFormData15: {}, //转换--字段选择
// 转换3end------------ // 转换3end------------
getField: [], outPutFormData16:{},//脚本--执行sql脚本
transGraphVisible: false, //执行转换弹窗 doubleClickCell:{},
getField:[],
transGraphVisible:false,//执行转换弹窗
monitorCanvas: "", //监听画布 monitorCanvas: "", //监听画布
getXmlVal: "", //获取上一个xml getXmlVal: "", //获取上一个xml
keyHandler: null, keyHandler: null,
...@@ -1307,8 +1332,10 @@ export default { ...@@ -1307,8 +1332,10 @@ export default {
selectFieldDialog:false,//选择字段 selectFieldDialog:false,//选择字段
// 流程弹窗组件start---------- // 流程弹窗组件start----------
switchVisible: false,
// 流程弹窗组件end------------ // 流程弹窗组件end------------
// 脚本组件start-----
scriptVisible:false,
// 脚本组件end-----
// 输入模块 // 输入模块
file: [], file: [],
...@@ -1402,9 +1429,17 @@ export default { ...@@ -1402,9 +1429,17 @@ export default {
mergeRecords, //合并记录 mergeRecords, //合并记录
selectField,//选择字段 selectField,//选择字段
// 作业弹簧组件end---------------------- // 作业弹簧组件end----------------------
// 转换弹窗组件start--------- // 流程弹窗组件start---------
switchDialog, switchDialog,
// 转换弹窗组件end----------- // 流程弹窗组件end-----------
// 脚本弹窗组件---
sqlScriptDialog,
// 脚本弹窗组件---
// 转换弹窗组件start---
columnChoose,
// 转换弹窗组件end-----
}, },
//自定义指令 https://www.jb51.net/article/108047.htm //自定义指令 https://www.jb51.net/article/108047.htm
directives: { directives: {
...@@ -2471,15 +2506,12 @@ export default { ...@@ -2471,15 +2506,12 @@ export default {
this.$refs.mytrans.clickFun(this.graph); //向子组件传递画布 this.$refs.mytrans.clickFun(this.graph); //向子组件传递画布
}, 500); }, 500);
return; return;
} else if ( } else if((this.curFileType=="transformation" && cell.ids == "step45") || cell.value.attributes.ctype.value == "ExecSQL"){
(this.curFileType == "transformation" && cell.ids == "step36") ||
cell.value.attributes.ctype.value == "SwitchCase"
) {
//流程--Switch / Case //流程--Switch / Case
this.switchVisible = !this.switchVisible; this.scriptVisible = !this.scriptVisible;
this.outPutFormData15 = this.showDataFunc(); this.outPutFormData16 = this.showDataFunc();
setTimeout(() => { setTimeout(() => {
this.$refs.switch.clickFun(this.graph); //向子组件传递画布 this.$refs.script.clickFun(this.graph);//向子组件传递画布
}, 500); }, 500);
return; return;
} }
......
src/views/job-dialog/homework.vue
...@@ -441,7 +441,6 @@ export default ({ ...@@ -441,7 +441,6 @@ export default ({
formData.append('query', ''); formData.append('query', '');
getLogLevelList(formData).then(res=>{ getLogLevelList(formData).then(res=>{
if (res) { if (res) {
console.log('获取日志级别==',res);
this.logLevelList=res; this.logLevelList=res;
}else { }else {
this.$message.error(res.errMsg) this.$message.error(res.errMsg)
......
src/views/kettle/home2.vue
...@@ -1209,22 +1209,17 @@ props: ["dragItem"], ...@@ -1209,22 +1209,17 @@ props: ["dragItem"],
}, },
// 新建任务 // 新建任务
createJob(){ createJob(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true; this.estabDialogVisible=true;
this.estabTitle='任务'; this.estabTitle='任务';
}else{
this.$message.error('请选择资源库中的一个目录');
}
}, },
// 新建目录 // 新建目录
createFile(){ createFile(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true; this.estabDialogVisible=true;
this.estabTitle='目录'; this.estabTitle='目录';
}else{
this.$message.error('请选择资源库中的一个目录');
}
}, },
// 删除资源库文件 // 删除资源库文件
...@@ -1257,6 +1252,7 @@ props: ["dragItem"], ...@@ -1257,6 +1252,7 @@ props: ["dragItem"],
this.curNode=node;//当前选中节点 this.curNode=node;//当前选中节点
this.nodePath=data.path;//当前选择数 this.nodePath=data.path;//当前选择数
this.curNodeIconCls=node.data.iconCls; this.curNodeIconCls=node.data.iconCls;
console.log('当前节点的文件夹路径:',this.nodePath); console.log('当前节点的文件夹路径:',this.nodePath);
if(node.data.leaf){ if(node.data.leaf){
this.curNodeText=node.data.text;//当前节点 this.curNodeText=node.data.text;//当前节点
...@@ -1270,12 +1266,12 @@ props: ["dragItem"], ...@@ -1270,12 +1266,12 @@ props: ["dragItem"],
// this.tabShowFlag=true;//核心对象显项卡显示 // this.tabShowFlag=true;//核心对象显项卡显示
//mxl判断作业和转换---------------------- //mxl判断作业和转换----------------------
if(node.data.type=="transformation"){
this.$refs.nodeMenu2.stepsFun(); this.$refs.nodeMenu2.stepsFun();
let that=this; let that=this;
setTimeout(function(){ setTimeout(function(){
that.$refs.graphContainer.initGraphClick("transformation"); that.$refs.graphContainer.initGraphClick("transformation");
},500) },500)
})
}else if(node.data.type=="job"){ }else if(node.data.type=="job"){
this.$refs.nodeMenu2.jobentrysFun(); this.$refs.nodeMenu2.jobentrysFun();
let that=this; let that=this;
...@@ -1297,8 +1293,8 @@ props: ["dragItem"], ...@@ -1297,8 +1293,8 @@ props: ["dragItem"],
})
}
// else{ // else{
// this.$message.error('请选择一个资源库！'); // this.$message.error('请选择一个资源库！');
// return; // return;
......
src/views/watch/transform.vue
...@@ -418,8 +418,7 @@ export default { ...@@ -418,8 +418,7 @@ export default {
//查看详情 //查看详情
checkDetail(row) { checkDetail(row) {
      console.log('打开查看详情弹窗id不为为null'); this.pageLog.transId=row.transId;
this.pageLog.transId=row.id;
this.getKettleTransRecordList();// 分页获取转换执行日志记录列表 this.getKettleTransRecordList();// 分页获取转换执行日志记录列表
this.getSimpleList();//获取我添加的作业列表 搜索下拉框列表 this.getSimpleList();//获取我添加的作业列表 搜索下拉框列表
this.dialogShow=true;      this.dialogShow=true;     
...@@ -427,7 +426,6 @@ export default { ...@@ -427,7 +426,6 @@ export default {
//获取转换下拉列表 //获取转换下拉列表
getSimpleList(){ getSimpleList(){
getList().then((res)=>{ getList().then((res)=>{
console.log('获取转换日志下拉列表:',res);
if(res.success){ if(res.success){
this.simpleList=res.data; this.simpleList=res.data;
} }
......
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