TreeData
/
cloud-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: TreeData:967c82c997ff33e09947f90d73be7d54ddda355c
Branches Tags
TreeData:dev
TreeData:master
TreeData:wangxinyuan
TreeData:cyp
TreeData:dev_week01
..
compare: TreeData:3b19c4a2fdccc5cdc6a47365428299601fcad84c
Branches Tags
TreeData:dev
TreeData:master
TreeData:wangxinyuan
TreeData:cyp
TreeData:dev_week01

No commits in common. "967c82c997ff33e09947f90d73be7d54ddda355c" and "3b19c4a2fdccc5cdc6a47365428299601fcad84c" have entirely different histories.
967c82c997 ... 3b19c4a2fd

6 changed files with 73 additions and 197 deletions
Show Stats Expand all files Collapse all files

33
src/api/task/task.js
View File

@ -36,12 +36,12 @@ export function deleteByTaskId(id) {
} }
//获得所有数据结构信息 //获得所有数据结构信息
// export function tableInfoList() { export function tableInfoList() {
// return request({ return request({
// url: "/task/tableInfo/list", url: "/task/tableInfo/list",
// method: "GET", method: "GET",
// }) })
// } }
//获得所有数据结构信息 //获得所有数据结构信息
export function findByTableId(id) { export function findByTableId(id) {
@ -80,31 +80,12 @@ export function findByNodeId(nodeId) {
//联查记录添加 //联查记录添加
export function addTaskJoin(data) { export function addTaskJoin(data) {
return request({ return request({
url: "/task/taskJoin/addTaskJoin", url: "/task/taskJoin/addTaskJoin/",
method: "POST", method: "POST",
data:data data:data
}) })
} }
//添加数据输出节点
export function addTaskOutPut(data) {
return request({
url: "/task/taskOutPut/addTaskOutPut",
method: "POST",
data:data
})
}
//执行任务
export function executeTask(id) {
return request({
url: "/task/executeTask/"+id,
method: "POST"
})
}

22
src/views/components/task/formData.vue
View File

@ -30,7 +30,6 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="taskInputAdd = false">取 消</el-button> <el-button @click="taskInputAdd = false">取 消</el-button>
<el-button type="primary" @click="addTaskInput()">下一步</el-button> <el-button type="primary" @click="addTaskInput()">下一步</el-button>
<el-button @click="nb()">测试</el-button>
</div> </div>
</span> </span>
@ -124,7 +123,6 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelColumn()">上一步</el-button> <el-button @click="cancelColumn()">上一步</el-button>
<el-button type="primary" @click="columnAddGood()">确 定</el-button> <el-button type="primary" @click="columnAddGood()">确 定</el-button>
<el-button @click="nb()">测试</el-button>
</div> </div>
</span> </span>
</div> </div>
@ -139,7 +137,7 @@ import { selectEngineList } from '@/api/engine/engine'
export default { export default {
//import引入的组件需要注入到对象中才能使用" //import引入的组件需要注入到对象中才能使用"
components: {}, components: {},
props:['graph','nodeId','taskInputForm','tableInfo','nodeName','columnList'], props:['graph','nodeId','taskInputForm','tableInfo','nodeName'],
data() { data() {
//这里存放数据" //这里存放数据"
@ -158,7 +156,6 @@ export default {
joinSelect:{}, joinSelect:{},
taskAddReq:{}, taskAddReq:{},
taskInputReq:{}, taskInputReq:{},
nbList:[],
engineReq:{ engineReq:{
pageNum: 1, pageNum: 1,
pageSize: 100 pageSize: 100
@ -168,7 +165,6 @@ export default {
value:[], value:[],
engineList:[], engineList:[],
columnList:[],
//树状图 //树状图
data:[], data:[],
@ -178,6 +174,8 @@ export default {
}, },
tableList:[], tableList:[],
columnList:[],
structureList:[],
itemId:0, itemId:0,
}; };
@ -219,9 +217,9 @@ export default {
"tableAsField":this.tableInfo.tableAsField.substring(1), "tableAsField":this.tableInfo.tableAsField.substring(1),
"fieldAsEngineId":this.tableInfo.fieldAsEngineId "fieldAsEngineId":this.tableInfo.fieldAsEngineId
}).then(res=>{ }).then(res=>{
alert(res.msg); alert(res.msg);
}) })
//添加记录
}, },
//选择完下拉框的表后点击下一步 //选择完下拉框的表后点击下一步
@ -237,10 +235,8 @@ export default {
val = this.tableInfo.columnList; val = this.tableInfo.columnList;
return; return;
} }
this.columnList = val;
this.tableInfo.tableField = ""; this.tableInfo.tableField = "";
this.tableInfo.tableAsField = ""; this.tableInfo.tableAsField = "";
val.forEach(item=>{ val.forEach(item=>{
this.tableInfo.tableField +=','+ item.columnName; this.tableInfo.tableField +=','+ item.columnName;
this.tableInfo.tableAsField +=','+ item.tableAsField; this.tableInfo.tableAsField +=','+ item.tableAsField;
@ -252,16 +248,12 @@ export default {
//根据树状下拉的选择赋值字段信息 //根据树状下拉的选择赋值字段信息
handleNodeClick(data) { handleNodeClick(data) {
this.tableInfo = data; this.tableInfo = data;
console.log(data) findStructureByTableId(data.id).then((res)=>{
this.tableInfo.structureList = [];
findStructureByTableId(data.id).then(res=>{
this.tableInfo.structureList=res.data; this.tableInfo.structureList=res.data;
}) })
this.tableInfo.taskId = this.$route.params.id; this.tableInfo.taskId = this.$route.params.id;
}, const cellById = this.graph.getCellById(this.nodeId)
cellById.setData(this.tableInfo);
nb(){
console.log(this.tableInfo.structureList)
}, },
//弹出选择表界面给树状下拉框赋值 //弹出选择表界面给树状下拉框赋值

145
src/views/components/task/formDataOut.vue
View File

@ -2,60 +2,13 @@
<div> <div>
<!-- 数据输出表单--> <!-- 数据输出表单-->
<span v-if="taskDataOutPut"> <span v-if="taskDataOutPut">
<el-button @click="nb"></el-button><br> <el-select v-model="tableInfo.tableName" placeholder="请选择数据库">
<el-option style="height: 100%" :value="tableInfo.tableName">
<span v-for="(outPut,index) in dataOutPut.tableField.split(',')">
<el-checkbox :label=outPut :value=outPut v-model="twoInputList">字段名： {{ outPut }} 字段别名：{{dataOutPut.tableField.split(',')[index]}}</el-checkbox><br>
</span>
<el-select v-model="dataOutPut.tableName" placeholder="请选择数据库">
<el-aside width="100%"> <el-aside width="100%">
<el-option style="height: 100%" :value="dataOutPut.tableName"> <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</el-option>
</el-aside> </el-aside>
</el-option>
</el-select> </el-select>
<div slot="footer" class="dialog-footer">
<el-button @click="taskDataOutPut = false">取消</el-button>
<el-button type="primary" @click="toSelectField()">确 定</el-button>
</div>
</span>
<!-- 选择目标字段-->
<span v-if="selectField">
<span v-for="(two,index) in twoInputList">
{{two}}
<el-select v-model="target[index]" placeholder="请选择">
<el-option v-for="item in columnList" :label="item.columnName" :value="item.columnName"></el-option>
</el-select>
<br>
</span>
<!-- <el-table-->
<!-- :data="twoInputList" style="width: 100%" max-height="250">-->
<!-- <el-table-column label="输入字段" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span style="margin-left: 10px">{{ scope.row}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="目标字段" width="100">-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<div slot="footer" class="dialog-footer">
<el-button @click="back()">上一步</el-button>
<el-button type="primary" @click="addOutput()">确 定</el-button>
</div>
</span> </span>
</div> </div>
</template> </template>
@ -63,15 +16,10 @@
<script> <script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
//例如：import 《组件名称》 from '《组件路径》, //例如：import 《组件名称》 from '《组件路径》,
import { findStructureByTableId, findTableInfoList } from '@/api/etl/switch'
import { addTaskOutPut, findByNodeId } from '@/api/task/task'
import item from '@/layout/components/Sidebar/Item.vue'
import fa from 'element-ui/src/locale/lang/fa'
export default { export default {
//import引入的组件需要注入到对象中才能使用" //import引入的组件需要注入到对象中才能使用"
components: {}, components: {},
props:['graph','nodeId','nodeName','taskId','taskDataOutPut','columnList','neighbors'], props:['graph','nodeId','nodeName','taskId','taskDataOutPut'],
data() { data() {
//这里存放数据" //这里存放数据"
@ -79,103 +27,28 @@ export default {
//树状图 //树状图
data:[], data:[],
selectField:false,
defaultProps:{ defaultProps:{
children:"children", children:"children",
label:'tableName' label:'tableName'
}, },
dataOutPut:{},
oneInputList:{},
tableAsField:'',
tableField:'',
basicId:'',
tableId:'',
twoInputList:[],
target:[],
columnList:[],
oneNode:{},
twoNode:{},
}; };
}, },
//计算属性 类似于data概念", //计算属性 类似于data概念",
computed: { computed: {},
fa() {
return fa
}
},
//监控data中的数据变化", //监控data中的数据变化",
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
// //字段多选框选择赋值
addOutput(){ handleSelectionChange(val) {
addTaskOutPut({
"taskId":this.taskId,
"newFileName":this.target.toString(),
"lastFileName":this.twoInputList.toString(),
"tableId":this.tableId,
"basicId":this.basicId,
}).then(res=>{
alert(res.msg)
});
},
//选择需要的字段后去选择对应数据库的表
toSelectField(){
this.taskDataOutPut = false;
this.selectField = true;
},
nb(){
this.findTAbleInfoList();
},
//弹出选择表界面给树状下拉框赋值
findTAbleInfoList(){
findTableInfoList().then(res=>{
this.data=res.data;
})
this.tableAsField="";
findByNodeId(this.neighbors[0]).then(res=>{
this.oneNode = res.data;
console.log(this.oneNode)
})
findByNodeId(this.neighbors[1]).then(res=>{
this.twoNode = res.data;
console.log(this.twoNode)
})
this.dataOutPut.tableField = this.oneNode.tableField + ',' + this.twoNode.tableField
this.dataOutPut.tableAsField = this.oneNode.tableAsField + ',' + this.twoNode.tableAsField
},
//返回上一步
back(){
this.taskDataOutPut = true;
this.selectField = false;
},
//选择要将数据存入的表中
handleNodeClick(data) {
this.tableId = data.id
this.basicId = data.basicId
findStructureByTableId(data.id).then((res)=>{
this.columnList=res.data;
})
}, },
}, },
//生命周期 - 创建完成（可以访问当前this实例）", //生命周期 - 创建完成（可以访问当前this实例）",
created() { created() {
this.findTAbleInfoList(); this.findAllTable();
}, },
//生命周期 - 挂载完成（可以访问DOM元素）", //生命周期 - 挂载完成（可以访问DOM元素）",
mounted() { mounted() {

15
src/views/components/task/formJoin.vue
View File

@ -5,9 +5,9 @@
<el-form label-width="80px" :model="formJoin" ref="queryForm" :inline="true" class="demo-form-inline" size="small"> <el-form label-width="80px" :model="formJoin" ref="queryForm" :inline="true" class="demo-form-inline" size="small">
<el-form-item label="联查方式"> <el-form-item label="联查方式">
<el-select v-model="formJoin.joinType" placeholder="请选择"> <el-select v-model="formJoin.joinType" placeholder="请选择">
<el-option style="height: 100%" label="左联查" value="left join"/> <el-option style="height: 100%" label="左联查" value="1"/>
<el-option style="height: 100%" label="右联查" value="right join"/> <el-option style="height: 100%" label="右联查" value="2"/>
<el-option style="height: 100%" label="内联查" value="inner join"/> <el-option style="height: 100%" label="内联查" value="3"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
@ -63,8 +63,6 @@ export default {
return { return {
taskInputJoin: true, taskInputJoin: true,
formJoin: {}, formJoin: {},
leftId:null,
rightId:null,
oneFieldList:'', oneFieldList:'',
twoFieldList:'', twoFieldList:'',
}; };
@ -84,27 +82,24 @@ export default {
"nodeId":this.nodeId, "nodeId":this.nodeId,
"nodeName":this.nodeName, "nodeName":this.nodeName,
"taskId":this.taskId, "taskId":this.taskId,
"leftId":this.leftId,
"joinType":this.formJoin.joinType, "joinType":this.formJoin.joinType,
"rightId":this.rightId,
"leftJoinField":this.formJoin.leftJoinField, "leftJoinField":this.formJoin.leftJoinField,
"rightJoinField":this.formJoin.rightJoinField "rightJoinField":this.formJoin.rightJoinField
} }
).then(res=>{ ).then(res=>{
alert(res.msg);
}) })
}, },
//拿到连线节点的数据 //拿到连线节点的数据
findAllTable(){ findAllTable(){
alert(this.neighbors)
findByNodeId(this.neighbors[0]).then(res=>{ findByNodeId(this.neighbors[0]).then(res=>{
this.oneFieldList = res.data.tableAsField; this.oneFieldList = res.data.tableAsField;
this.leftId = res.data.id;
console.log(this.oneFieldList) console.log(this.oneFieldList)
}) })
findByNodeId(this.neighbors[1]).then(res=>{ findByNodeId(this.neighbors[1]).then(res=>{
this.twoFieldList = res.data.tableAsField; this.twoFieldList = res.data.tableAsField;
this.rightId = res.data.id;
console.log(this.twoFieldList) console.log(this.twoFieldList)
}) })
}, },

4
src/views/task/task/antvX6.vue
View File

@ -33,8 +33,7 @@
<!-- 数据输出弹窗--> <!-- 数据输出弹窗-->
<el-dialog title="数据输出" :visible.sync="taskDataOutPut" width="70%"> <el-dialog title="数据输出" :visible.sync="taskDataOutPut" width="70%">
<dataOutInput v-if="formOut" :taskDataOutPut="taskDataOutPut" :neighbors="neighbors" <dataOutInput v-if="formOut" taskDataOutPut:taskDataOutPut></dataOutInput>
:taskId="taskId"></dataOutInput>
</el-dialog> </el-dialog>
@ -68,7 +67,6 @@ export default {
taskInputFieldAdd:false, taskInputFieldAdd:false,
//连再联查的节点id //连再联查的节点id
neighbors:[], neighbors:[],
columnList:[],
//记录表信息 //记录表信息
tableInfo:{}, tableInfo:{},
//画布节点选项 //画布节点选项

51
src/views/task/task/index.vue
View File

@ -41,12 +41,39 @@
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
<!-- <el-form :model="sourceAddReq">-->
<!-- <el-form-item label="id">-->
<!-- <el-input v-model="sourceAddReq.id"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务名称">-->
<!-- <el-input v-model="sourceAddReq.name"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务执行状态">-->
<!-- <el-input v-model="sourceAddReq.weigh"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务完成度">-->
<!-- <el-input v-model="sourceAddReq.status"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-dialog>-->
<el-table <el-table
:data="taskList" :data="taskList"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="55"> width="55">
@ -329,10 +356,15 @@
<script> <script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
//例如：import 《组件名称》 from '《组件路径》, //例如：import 《组件名称》 from '《组件路径》,
import {selectSourceList} from "@/api/etl/switch";
import {selectSourceExport} from "@/api/etl/switch";
import {connectionTest} from "@/api/etl/switch";
import {insertAdd} from "@/api/etl/switch";
import {getInfo} from "@/api/etl/switch";
import { import {
addTask, addTask,
deleteByTaskId, executeTask, findByTableId, findStructureList, deleteByTaskId, findByTableId, findStructureList,
selectTaskList selectTaskList, tableInfoList
} from '@/api/task/task' } from '@/api/task/task'
export default { export default {
@ -385,15 +417,20 @@ export default {
}, },
//数据结构列表
executeTask(row){ tableInfoList(){
this.taskInputAdd = true; tableInfoList().then(res=>{
executeTask(row.id).then(res=>{ this.tableList = res.data;
}); });
}, },
executeTask(){
this.taskInputAdd = true;
this.tableInfoList();
},
addTaskInput(taskInfo){ addTaskInput(taskInfo){
this.taskInputAdd = false; this.taskInputAdd = false;
this.findStructureList(taskInfo); this.findStructureList(taskInfo);