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

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

 <template>
 <template>
   <div class="tableInput">
   <div class="tableInput">
-    <el-form ref="stepName" :model="stepName" label-width="120px">
+    <el-form ref="stepName" :model="form" label-width="120px">
       <el-form-item label="步骤名称:">
       <el-form-item label="步骤名称:">
-        <el-input v-model="stepName.name" @change="tableInputName"></el-input>
+        <el-input v-model="form.name" @change="tableInputName"></el-input>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 

src/views/kettle/home2.vue

@@ -1205,7 +1205,6 @@ props: ["dragItem"],
     },
     },
     handleNodeClick(data,node){
     handleNodeClick(data,node){
         console.log('点击当前节点===',node);
         console.log('点击当前节点===',node);
-         this.nodePath=data.path;//当前选择数
         this.curNodeIconCls=data.iconCls;//当前选中节点
         this.curNodeIconCls=data.iconCls;//当前选中节点
         console.log('当前节点的文件夹路径:',this.nodePath);
         console.log('当前节点的文件夹路径:',this.nodePath);
         if(node.data.leaf){
         if(node.data.leaf){
@@ -1219,6 +1218,9 @@ props: ["dragItem"],
                 // this.tabShowFlag=true;//核心对象显项卡显示
                 // this.tabShowFlag=true;//核心对象显项卡显示
                 this.activeName="second";
                 this.activeName="second";
 
 
+
+
+
             // var xmlDocument = mxUtils.parseXml(res);
             // var xmlDocument = mxUtils.parseXml(res);
 			// 			var decoder = new mxCodec(xmlDocument);
 			// 			var decoder = new mxCodec(xmlDocument);
 			// 			var node = xmlDocument.documentElement;
 			// 			var node = xmlDocument.documentElement;