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

src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue

@@ -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 {
           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/job-dialog/homework.vue

@@ -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

@@ -1208,22 +1208,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('请选择资源库中的一个目录');
-        }
+
 
 
     },
     },
     // 删除资源库文件
     // 删除资源库文件

src/views/watch/transform.vue

@@ -418,8 +418,7 @@ export default {
 
 
     //查看详情
     //查看详情
     checkDetail(row) {
     checkDetail(row) {
-      console.log('打开查看详情弹窗id不为为null');
-      this.pageLog.transId=row.id;
+      this.pageLog.transId=row.transId;
       this.getKettleTransRecordList();// 分页获取转换执行日志记录列表
       this.getKettleTransRecordList();// 分页获取转换执行日志记录列表
       this.getSimpleList();//获取我添加的作业列表 搜索下拉框列表
       this.getSimpleList();//获取我添加的作业列表 搜索下拉框列表
       this.dialogShow=true;     
       this.dialogShow=true;     
@@ -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;
         }
         }