Skip to content

E
ETL-admin
Commit 4e9ff468 by 莫晓莉
Options

Merge branch 'master' of http://139.159.239.83:9093/mxl/ETL-admin

parents d6c7fb0a 65791538
Showing with 100 additions and 109 deletions
src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
......@@ -145,7 +145,7 @@
</span>
</el-dialog>
<estab-dialog
ref="establishDia"
......@@ -229,7 +229,7 @@ export default {
created() {
this.listDatabasesFun();
}, // 监听编号好后获取选择的数据库的树形里列表
// watch: {
// formDataBaseName: {
// handler(newValue, oldValue) {
......@@ -251,7 +251,7 @@ export default {
}, 500);
},
tableInputName() {
this.stepName;
},
......@@ -259,7 +259,7 @@ export default {
//  //获取新建弹窗返回来的值
getSonValue(res) {
if (typeof res == "string") {
this.formDataBaseName = res;
console.log("接收子组件的值1111111----", this.formDataBaseName);
} else if (typeof res == "object") {
......@@ -303,7 +303,7 @@ export default {
getGraphDataBases() {
// var graph = this.getGraph();
var root = this.newGraph.getDefaultParent(),
data = [];
if (root.getAttribute("databases") != null)
......@@ -327,7 +327,7 @@ export default {
this.dialogVisibleFourth = true;
// this.$refs.establishDia.database();
// this.$refs.establishDia.accessMethod(); //获取连接方式
this.$refs.establishDia.clickFun(this.newGraph); //先把画布传过去
this.$refs.establishDia.getTransDatabase();
this.$refs.establishDia.accessMethod(); //获取连接方式
......@@ -338,7 +338,7 @@ export default {
dialogVisibleFourthFun() {
this.dialogVisibleFourth = true;
// this.$refs.establishDia.database(this.connectionName);
this.$refs.establishDia.clickFun(this.newGraph); //先把画布传过去
if (this.form.connection) {
this.dialogVisibleFourth = true;
......@@ -346,8 +346,8 @@ export default {
this.$refs.establishDia.accessMethod(); //获取连接方式
}
// this.$refs.establishDia.database(this.selectName);
},
lastStep() {
......@@ -390,7 +390,7 @@ export default {
mps.append("table", this.tableDetails.text);
tableFields(mps).then((res) => {
// console.log(res);
for (let i = 0; i < res.length; i++) {
......@@ -398,7 +398,7 @@ export default {
// this.fieldName = this.fieldName + element + ","
if (!i == 0) {
this.fieldName = this.fieldName + "," + element;
this.fieldName = this.fieldName + "\n," + element;
} else {
this.fieldName = element;
}
......@@ -406,7 +406,7 @@ export default {
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}`;
});
},
......@@ -414,7 +414,7 @@ export default {
if (this.form.connection) {
this.browsing = !this.browsing;
this.scanFlag = true;
} else {
this.$message.error("请选择数据库");
console.log(this.stepName);
......@@ -463,7 +463,7 @@ export default {
handleNodeClick(data, node) {
console.log("点击当前节点node===", node);
console.log("点击当前节点data===", data);
this.tableDetails = data;
},
......
src/views/job-dialog/homework.vue
......@@ -11,7 +11,7 @@
<el-form-item label="步骤名称:">
<el-input v-model="myForm.label"></el-input>
</el-form-item>
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="作业设置" name="first">
<el-radio-group v-model="myForm.specification_method" style="width:100%;">
......@@ -21,22 +21,22 @@
<el-row :gutter="10">
<el-col :span="23">
<el-radio label="filename" >作业文件名</el-radio>
</el-col>
</el-col>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item label-width="100px">
<el-row :gutter="10">
<el-col :span="20">
<el-input v-model="myForm.filename" :disabled="myForm.specification_method=='filename'? false:true"></el-input>
</el-col>
<el-col class="line" :span="3">
<el-button :disabled="myForm.specification_method=='filename'? false:true" size="mini" @click="chooseFile('filename')">选择</el-button></el-col
>
</el-row>
</el-form-item>
</div>
</div>
<div style="position:relative;border:1px solid #b5b8c8;margin:10px auto;">
......@@ -44,9 +44,9 @@
<el-row :gutter="10">
<el-col :span="23">
<el-radio label="rep_name" >通过目录与名称指定转换</el-radio>
</el-col>
</el-col>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item label-width="100px">
<el-row :gutter="10" label-width="100px">
<el-col :span="22">
......@@ -59,34 +59,34 @@
<el-col :span="20">
<el-input :disabled="myForm.specification_method=='rep_name'? false:true" v-model="myForm.jobname"></el-input>
</el-col>
<el-col class="line" :span="3">
<el-button :disabled="myForm.specification_method=='rep_name'? false:true" size="mini" @click="chooseExportTreeDialog('directory','jobname')">选择</el-button></el-col
>
</el-row>
</el-form-item>
</div>
</div>
<div style="position:relative;border:1px solid #b5b8c8;">
<el-form-item label-width="100px" >
<el-row :gutter="10">
<el-col :span="23">
<el-radio label="rep_ref" >通过引用指定作业</el-radio>
</el-col>
</el-col>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item label-width="100px" >
<el-row :gutter="10">
<el-col :span="20">
<el-input :disabled="myForm.specification_method=='rep_ref'? false:true" v-model="myForm.referenceName"></el-input>
</el-col>
<!-- <el-col class="line" :span="3">
<el-button :disabled="myForm.specification_method=='rep_ref'? false:true" size="mini" @click="chooseFile('template_filename')">选择</el-button></el-col> -->
</el-row>
</el-form-item>
</div>
<el-button size="mini" style="margin-top:10px;">新建转换</el-button>
</el-radio-group>
</el-radio-group>
</el-tab-pane>
<el-tab-pane label="高级" name="second">
......@@ -117,7 +117,7 @@
<el-select v-model="myForm.slave_server_name" style="width: 100%">
<el-option v-for="(item,index) in serverList" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-col>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="等待远程作业执行结束:" label-width="250px">
......@@ -157,21 +157,21 @@
<el-col :span="23">
<el-checkbox v-model="myForm.set_logfile" true-label='Y' false-label="N"></el-checkbox>
</el-col>
</el-row>
</el-row>
</el-form-item>
<el-form-item label="添加到日志文件尾:">
<el-row :gutter="10">
<el-col :span="23">
<el-checkbox :disabled="myForm.set_logfile=='Y'? false:true" v-model="myForm.set_append_logfile" true-label='Y' false-label="N"></el-checkbox>
</el-col>
</el-row>
</el-row>
</el-form-item>
<el-form-item label="日志文件名:">
<el-row :gutter="10">
<el-col :span="20">
<el-input v-model="myForm.logfile" :disabled="myForm.set_logfile=='Y'? false:true"></el-input>
</el-col>
<el-col class="line" :span="3">
<el-button size="mini" @click="chooseFile('logfile')" :disabled="myForm.set_logfile=='Y'? false:true">浏览</el-button></el-col
>
......@@ -183,7 +183,7 @@
<el-col :span="23">
<el-checkbox :disabled="myForm.set_logfile=='Y'? false:true" v-model="myForm.create_parent_folder" true-label='Y' false-label="N"></el-checkbox>
</el-col>
</el-row>
</el-row>
</el-form-item>
<el-form-item label="日志文件后缀名:">
<el-row :gutter="10">
......@@ -198,7 +198,7 @@
<el-select v-model="myForm.loglevel" style="width: 100%">
<el-option v-for="(item,index) in logLevelList" :key="index" :label="item.desc" :value="item.code"></el-option>
</el-select>
</el-col>
</el-col>
</el-row>
</el-form-item>
</el-tab-pane>
......@@ -233,7 +233,7 @@
<!-- 编辑弹窗结束============ -->
</el-card>
</el-tab-pane>
<el-tab-pane label="命名" name="fifth">
<el-card class="box-card" style="margin-top:15px;">
<div slot="header" class="clearfix">
......@@ -399,7 +399,7 @@ export default ({
}
}
},
props:["jobHomeworkVisible","jobWorkFormSend","excelOutPutVisible","saveOutputDialog","doubleClickCell"],
watch:{
......@@ -410,7 +410,7 @@ export default ({
if(val.arguments){
var ny=JSON.parse(val.arguments);
this.tableData=ny;
}
if(val.parameters){
var na=JSON.parse(val.parameters);
......@@ -420,7 +420,7 @@ export default ({
},
// 解决子组件改变父组件传进来的变量的属性不报错start------
},
created(){
// this.formatFunc();//获取时间日期格式
// this.getCodeList();//获取编码列表
......@@ -439,9 +439,8 @@ export default ({
getLogLevelList(){
var formData = new FormData();
formData.append('query', '');
getLogLevelList(formData).then(res=>{
if (res) {
console.log('获取日志级别==',res);
getLogLevelList(formData).then(res=>{
if (res) {
this.logLevelList=res;
}else {
this.$message.error(res.errMsg)
......@@ -449,7 +448,7 @@ export default ({
})
},
// radioChoose(val){
// let that = this
// let that = this
// switch(val){
// case 0:
// this.myForm.specification_method="filename";
......@@ -477,9 +476,9 @@ export default ({
// formatFunc(){
// var formData = new FormData();
// formData.append('query', '');
// formatFunc(formData).then(res=>{
// if (res) {
// console.log('时间日期格式==',res);
// formatFunc(formData).then(res=>{
// if (res) {
// console.log('时间日期格式==',res);
// this.formatTimeList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -490,9 +489,9 @@ export default ({
// getCodeList(){
// var formData = new FormData();
// formData.append('query', '');
// getCodeList(formData).then(res=>{
// if (res) {
// console.log('编码列表==',res);
// getCodeList(formData).then(res=>{
// if (res) {
// console.log('编码列表==',res);
// this.codeList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -503,9 +502,9 @@ export default ({
// getFontname(){
// var formData = new FormData();
// formData.append('query', '');
// getFontname(formData).then(res=>{
// if (res) {
// console.log('表头字体==',res);
// getFontname(formData).then(res=>{
// if (res) {
// console.log('表头字体==',res);
// this.headFontList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -516,9 +515,9 @@ export default ({
// getFontunderline(){
// var formData = new FormData();
// formData.append('query', '');
// getFontunderline(formData).then(res=>{
// if (res) {
// console.log('表头字体下划线==',res);
// getFontunderline(formData).then(res=>{
// if (res) {
// console.log('表头字体下划线==',res);
// this.headFontUnderlineList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -529,9 +528,9 @@ export default ({
// getFontoriention(){
// var formData = new FormData();
// formData.append('query', '');
// getFontoriention(formData).then(res=>{
// if (res) {
// console.log('表头字体方向==',res);
// getFontoriention(formData).then(res=>{
// if (res) {
// console.log('表头字体方向==',res);
// this.entionList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -542,9 +541,9 @@ export default ({
// getFontcolor(){
// var formData = new FormData();
// formData.append('query', '');
// getFontcolor(formData).then(res=>{
// if (res) {
// console.log('表头字体方向==',res);
// getFontcolor(formData).then(res=>{
// if (res) {
// console.log('表头字体方向==',res);
// this.colorList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -555,9 +554,9 @@ export default ({
// getFontalignment(){
// var formData = new FormData();
// formData.append('query', '');
// getFontalignment(formData).then(res=>{
// if (res) {
// console.log('表头对齐方式==',res);
// getFontalignment(formData).then(res=>{
// if (res) {
// console.log('表头对齐方式==',res);
// this.alignList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -571,9 +570,9 @@ export default ({
this.fileDialogVisible=true;
},
confirm(){
// console.log('步骤名称==：',this.stepName);
// console.log('步骤名称==：',this.stepName);
// this.excelForm.label=this.stepName.name;
this.myForm.arguments=JSON.stringify(this.tableData);//更新字段
this.myForm.parameters=JSON.stringify(this.tableDataUpdate);//更新字段
......@@ -602,15 +601,15 @@ export default ({
console.log('添加的字段===',this.fieldForm);
if (this.dataState) {
this.tableData.push(this.fieldForm);
}
}
},
// 获取字段类型
// getValueMetaStore(){
// var formData = new FormData();
// formData.append('query', '');
// getValueMetaStore(formData).then(res=>{
// if (res) {
// console.log('字段类型==',res);
// getValueMetaStore(formData).then(res=>{
// if (res) {
// console.log('字段类型==',res);
// this.metaStoreList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -621,9 +620,9 @@ export default ({
// getValueFormatStore(){
// var formData = new FormData();
// formData.append('valueType', 'all');
// getValueFormatStore(formData).then(res=>{
// if (res) {
// console.log('字段格式==',res);
// getValueFormatStore(formData).then(res=>{
// if (res) {
// console.log('字段格式==',res);
// this.formatStoreList=res;
// }else {
// this.$message.error(res.errMsg)
......@@ -632,7 +631,7 @@ export default ({
// },
// 获取字段
inputOutputFields(){
if(this.doubleClickCell){
if(this.doubleClickCell){
var title=this.doubleClickCell.value.attributes.label.value
}
console.log('获取cell888888===',this.doubleClickCell);
......@@ -683,7 +682,7 @@ export default ({
console.log('添加的字段===',this.fieldFormUpdate);
if (this.dataState) {
this.tableDataUpdate.push(this.fieldFormUpdate);
}
}
},
// -----更新end------------------
......@@ -715,4 +714,4 @@ export default ({
.el-form-item--small.el-form-item{
margin-bottom:5px !important;
}
</style>
\ No newline at end of file
</style>
src/views/kettle/home2.vue
......@@ -1208,22 +1208,17 @@ props: ["dragItem"],
},
// 新建任务
createJob(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true;
this.estabTitle='任务';
}else{
this.$message.error('请选择资源库中的一个目录');
}
},
// 新建目录
createFile(){
if(this.curNodeIconCls =='imageFolder'){
this.estabDialogVisible=true;
this.estabTitle='目录';
}else{
this.$message.error('请选择资源库中的一个目录');
}
},
// 删除资源库文件
......@@ -1255,7 +1250,7 @@ props: ["dragItem"],
this.curNode=node;//当前选中节点
this.nodePath=data.path;//当前选择数
this.curNodeIconCls=node.data.iconCls;
console.log('当前节点的文件夹路径:',this.nodePath);
if(node.data.leaf){
this.curNodeText=node.data.text;//当前节点
......@@ -1269,7 +1264,7 @@ props: ["dragItem"],
// this.tabShowFlag=true;//核心对象显项卡显示
//mxl判断作业和转换----------------------
if(node.data.type=="transformation"){
if(node.data.type=="transformation"){
this.$refs.nodeMenu2.stepsFun();
let that=this;
setTimeout(function(){
......@@ -1302,10 +1297,10 @@ props: ["dragItem"],
// this.$message.error('请选择一个资源库！');
// return;
// }
// console.log(data,'当前节点的父节点:',node.parent.data);
},
//修改资源库
......@@ -1340,7 +1335,7 @@ props: ["dragItem"],
console.log('导出资源库====');
this.exportDialogVisible=true;
},
// 导入资源库弹窗
importTreeDialog(){
console.log('导入资源库====');
......
src/views/watch/transform.vue
......@@ -24,7 +24,7 @@
</div>
</div>
</el-col>
<el-col :span="8" >
<el-col :span="8" >
<div class="grid-content bg-purpleThree">
<i class="el-icon-circle-close grid-icon"></i>
<div class="num-content">
......@@ -89,7 +89,7 @@
@current-change="pageChange"
/>
</div>
<!-- 分页end -->
<!-- 分页end -->
</div>
</el-card>
......@@ -146,7 +146,7 @@
{{ transStatusList[scope.row.recordStatus] }}
</template>
</el-table-column>
<el-table-column prop label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
......@@ -195,9 +195,9 @@
<pre v-highlightjs="logContent"><code class="java" /></pre>
</el-dialog>
</div>
</template>
......@@ -350,7 +350,7 @@ export default {
}else{
this.$message.error(res.errMsg)
}
});
},
// 获取总列表
......@@ -361,7 +361,7 @@ export default {
if(res.success){
this.allTableData = res.data;
}
});
},
......@@ -373,7 +373,7 @@ export default {
this.alRunningTransNum = res.data;
this.panelArr[0].num=this.alRunningTransNum;
}
});
},
......@@ -385,7 +385,7 @@ export default {
this.allSuccessCount = res.data;
this.panelArr[1].num=this.allSuccessCount;
}
});
},
// 获取总执行失败次数
......@@ -396,7 +396,7 @@ export default {
this.allFailCount = res.data;
this.panelArr[2].num=this.allFailCount;
}
});
},
......@@ -418,8 +418,7 @@ export default {
//查看详情
checkDetail(row) {
      console.log('打开查看详情弹窗id不为为null');
this.pageLog.transId=row.id;
this.pageLog.transId=row.transId;
this.getKettleTransRecordList();// 分页获取转换执行日志记录列表
this.getSimpleList();//获取我添加的作业列表 搜索下拉框列表
this.dialogShow=true;     
......@@ -427,7 +426,6 @@ export default {
//获取转换下拉列表
getSimpleList(){
getList().then((res)=>{
console.log('获取转换日志下拉列表:',res);
if(res.success){
this.simpleList=res.data;
}
......@@ -510,28 +508,28 @@ export default {
}
}
fileName = decodeURIComponent(fileName)
// 获取数据类型
let type = res.data.headers['Content-Type'][0];
let blob = new Blob([res.data], { type: type })
const a = document.createElement('a')
// 创建URL
const blobUrl = window.URL.createObjectURL(blob)
a.download = fileName;
a.href = blobUrl;
document.body.appendChild(a);
// 下载文件
a.click()
// 释放内存
URL.revokeObjectURL(blobUrl)
document.body.removeChild(a)
} else {
console.log('error', data)
}
// var returnUrl=res.data;
// var httpUrl= process.env.VUE_APP_BASE_API+returnUrl;
// this.downLoadFile(httpUrl);
......@@ -568,7 +566,7 @@ export default {
this.getKettleTransRecordList();
},
},
};
</script>
......
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