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

4e9ff468 · 莫晓莉 · d6c7fb0a · 65791538 · 4e9ff468 · 4e9ff468
Commit 4e9ff468 authored May 12, 2021 by 莫晓莉
Showing with 40 additions and 47 deletions

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

src/views/job-dialog/homework.vue
+0 -0

src/views/kettle/home2.vue
+9 -14

src/views/watch/transform.vue
+17 -19

No files found.
--- a/src/views/dashboard-kettle/components/appBulletFrame/tableInput.vue
+++ b/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;
    },

--- a/src/views/job-dialog/homework.vue
+++ b/src/views/job-dialog/homework.vue
--- a/src/views/kettle/home2.vue
+++ b/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('导入资源库====');

--- a/src/views/watch/transform.vue
+++ b/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.transId;
-      this.pageLog.transId=row.id;
      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>