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

Merge branch 'master' into wangxinyuan

wangxinyuan
TreeData 2024-08-23 21:01:46 +08:00
parent 7fd59e3b1c 3f5e8297db
commit 63fb611f96
8 changed files with 473 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/api/engine/engine.js
View File

@ -4,38 +4,40 @@ import request from '@/utils/request'
export function selectEngineList(data){
return request({
url: "/engine/engine/getMaintenanceList",
method: "Get",
data:data
})
}
//导出
export function selectSourceExport(data){
return request({
url: "/source/source/export",
method: "POST",
method: "post",
data:data
})
}
//新增
export function insertAdd(data){
export function insert(data){
return request({
url: "/source/source/insert",
method: "get",
url: "/engine/engine/insert",
method: "post",
data:data
})
}
export function update(data){
return request({
url: "/engine/engine/update",
method: "post",
data:data
})
}
//获取基本信息
export function getInfo(id){
export function del(id){
return request({
url: "/source/source/id",
method: "get",
url: "/engine/engine/delete/" + id,
method: "post",
data:id
})
}

16
src/api/etl/switch.js
View File

@ -9,14 +9,14 @@ export function selectSourceList(data){
})
}
//导出
export function selectSourceExport(data){
return request({
url: "/source/source/export",
method: "POST",
data:data
})
}
// //导出
// export function selectSourceExport(data){
// return request({
// url: "/source/source/export",
// method: "POST",
// data:data
// })
// }
//新增
export function insertAdd(data){

8
src/api/port/port/index.js 100644
View File

@ -0,0 +1,8 @@
import request from '@/utils/request'
export function getPhonePlace() {
return request({
url: '/mart/list/getPhonePlace',
method: 'get'
})
}

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

@ -1,6 +1,6 @@
import request from '@/utils/request'
//查询规则引擎列表
//查询任务列表
export function selectTaskList(data){
return request({
url: "/task/task/list",
@ -9,33 +9,30 @@ export function selectTaskList(data){
})
}
//导出
export function selectSourceExport(data){
//添加
export function addTask(data){
return request({
url: "/source/source/export",
url: "/task/task/addTask",
method: "POST",
data:data
})
}
//新增
export function insertAdd(data){
//修改
export function updateById(data) {
return request({
url: "/source/source/insert",
method: "get",
url: "/task/task/updateById",
method: "POST",
data: data
})
}
//获取基本信息
export function getInfo(id){
//删除
export function deleteByTaskId(id) {
return request({
url: "/source/source/id",
method: "get",
url: "/task/task/deleteById/" + id,
method: "POST"
})
}

221
src/views/engine/engine/index.vue
View File

@ -20,82 +20,65 @@
</el-form>
<!-- <el-button-->
<!-- v-hasPermi="['tool:gen:import']"-->
<!-- icon="el-icon-upload"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="info"-->
<!-- @click="findSelectSourceExport"-->
<!-- >导出-->
<!-- </el-button>-->
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="findSelectSourceExport"
v-hasPermi="['source:data:export']"
>导出
</el-button>
<!-- <el-button-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="insertAdd()"-->
<!-- >新增-->
<!-- </el-button>-->
<el-button
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="insert()"
>新增
</el-button>
<!-- <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
<!-- <el-form :model="sourceAddReq">-->
<!-- <el-form-item label="接入源名称">-->
<!-- <el-input v-model="sourceAddReq.dataResourceName"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据来源系统名称">-->
<!-- <el-input v-model="sourceAddReq.dataSourcesSystemName"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主机地址">-->
<!-- <el-input v-model="sourceAddReq.host"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="主机端口">-->
<!-- <el-input v-model="sourceAddReq.port"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据接入类型">-->
<!-- <el-input v-model="sourceAddReq.databaseType"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据库名称">-->
<!-- <el-input v-model="sourceAddReq.databaseName"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据库用户">-->
<!-- <el-input v-model="sourceAddReq.username"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据库密码">-->
<!-- <el-input v-model="sourceAddReq.password"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据连接参数">-->
<!-- <el-input v-model="sourceAddReq.connectionParams"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="初始化连接数量">-->
<!-- <el-input v-model="sourceAddReq.initLinkNum"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大连接数量">-->
<!-- <el-input v-model="sourceAddReq.maxLinkNum"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大等待时间">-->
<!-- <el-input v-model="sourceAddReq.maxWaitTime"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="最大等待次数">-->
<!-- <el-input v-model="sourceAddReq.maxWaitTimes"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注">-->
<!-- <el-input v-model="sourceAddReq.remark"></el-input>-->
<!-- </el-form-item>-->
<el-form :model="engine">
<el-form-item label="接入源名称">
<el-input v-model="engine.id"></el-input>
</el-form-item>
<el-form-item label="数据来源系统名称">
<el-input v-model="engine.name"></el-input>
</el-form-item>
<el-form-item label="主机地址">
<el-input v-model="engine.type"></el-input>
</el-form-item>
<el-form-item label="主机端口">
<el-input v-model="engine.scope"></el-input>
</el-form-item>
<el-form-item label="数据接入类型">
<el-input v-model="engine.engineCode"></el-input>
</el-form-item>
<el-form-item label="数据库名称">
<el-input v-model="engine.isActivate"></el-input>
</el-form-item>
<el-form-item label="数据库用户">
<el-input v-model="engine.status"></el-input>
</el-form-item>
<el-form-item label="数据库密码">
<el-input v-model="engine.description"></el-input>
</el-form-item>
<!-- </el-form>-->
</el-form>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="dialogFormVisible = false">测试</el-button>-->
<!-- <el-button @click="dialogFormVisible = false">取 消</el-button>-->
<!-- <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
</div>
</el-dialog>
@ -112,6 +95,7 @@
<span v-if="scope.row.type==2">基本类型</span>
<span v-if="scope.row.type==3">时间类型</span>
<span v-if="scope.row.type==4">普通类型</span>
<span v-if="scope.row.type==4">介入类型</span>
</template>
</el-table-column>
<el-table-column label="作用域" style="color: blue" prop="scope">
@ -146,23 +130,20 @@
<el-table-column
align="right">
<template slot-scope="scope">
<el-button
icon="el-icon-pear"
size="mini"
type="text"
@click="update(scope.row)">规则维护</el-button>
<el-button
icon="el-icon-delete"
size="mini"
type="text"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row.id)">删除</el-button>
<el-button
icon="el-icon-service"
size="mini"
type="text"
@click="struceure(scope.row)">修改</el-button>
@click="handUpdate(scope.row.id)">规则维护</el-button>
</template>
</el-table-column>
@ -175,6 +156,42 @@
<!-- 分页-->
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="engineReq.pageNum"
:page-sizes="[1, 2, 3, 4, 5]"
:page-size="engineReq.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</template>
@ -182,8 +199,7 @@
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
//例如：import 《组件名称》 from '《组件路径》,
import {insertAdd} from "@/api/etl/switch";
import {selectEngineList} from "@/api/engine/engine";
import {selectList} from "@/api/pay/customer";
import {del, insert, selectEngineList, update} from "@/api/engine/engine";
export default {
//import引入的组件需要注入到对象中才能使用"
components: {},
@ -192,14 +208,16 @@ export default {
//这里存放数据"
return {
// dialogFormVisible:false,
// SourceReq:{
//
// },
engineReq:{
pageNum:1,
pageSize:5
},
engine:{
},
arr:[],
dialogFormVisible:false,
total:0
};
},
//计算属性 类似于data概念",
@ -208,15 +226,44 @@ export default {
watch: {},
//方法集合",
methods: {
selectList,
// insertAdd(){
// this.dialogFormVisible=true
// },
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.engineReq.pageSize = val;
this.findSelectSourceList();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.engineReq.pageNum = val;
this.findSelectSourceList();
},
insert(){
this.dialogFormVisible = true
insert(this.engine).then(res =>{
this.$message.success(res.msg || "添加成功")
})
this.engine = {}
},
findSelectSourceList(){
selectEngineList().then(res=>{
this.arr=res.data;
selectEngineList(this.engineReq).then(res=>{
this.arr=res.data.list;
this.total=res.data.total;
})
},
handleDelete(id){
del(id).then(res =>{
this.$message.success(res.msg || "删除成功")
})
},
handUpdate(){
update(this.engine).then(res =>{
this.$message.success(res.msg || "修改成功")
})
},
findSelectSourceExport(){
this.download('engine/engine/export', {
...this.engineReq
}, `source_${new Date().getTime()}.xlsx`)
}
},
//生命周期 - 创建完成（可以访问当前this实例）",
created() {

7
src/views/etl/switch/index.vue
View File

@ -28,10 +28,10 @@
<el-button
v-hasPermi="['tool:gen:import']"
icon="el-icon-upload"
icon="el-icon-download"
plain
size="mini"
type="info"
type="warning"
@click="findSelectSourceExport"
>导出
</el-button>
@ -297,8 +297,7 @@ export default {
findSelectSourceExport(){
this.download('source/source/export', {
...this.SourceReq
}, `type_${new Date().getTime()}.xlsx`)
// selectSourceExport(this.SourceReq).then();
}, `source_${new Date().getTime()}.xlsx`)
},
handleSelectionChange(row){
this.ids=[];

87
src/views/port/port/index.vue 100644
View File

@ -0,0 +1,87 @@
<template>
<div>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>手机号查询归属地</span>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>IP查询归属地</span>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
<div v-for="o in 4" :key="o" class="text item">
{{'列表内容 ' + o }}
</div>
</el-card>
</div>
</template>
<script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
//例如：import 《组件名称》 from '《组件路径》,
import {getPhonePlace} from "@/api/port/port";
export default {
//import引入的组件需要注入到对象中才能使用"
components: {},
props: {},
data() {
//这里存放数据"
return {};
},
//计算属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {},
//生命周期 - 创建完成（可以访问当前this实例）",
created() {
},
//生命周期 - 挂载完成（可以访问DOM元素）",
mounted() {
},
beforeCreate() {
}, //生命周期 - 创建之前",
beforeMount() {
}, //生命周期 - 挂载之前",
beforeUpdate() {
}, //生命周期 - 更新之前",
updated() {
}, //生命周期 - 更新之后",
beforeDestroy() {
}, //生命周期 - 销毁之前",
destroyed() {
}, //生命周期 - 销毁完成",
activated() {
} //如果页面有keep-alive缓存功能，这个函数会触发",
};
</script>
<style scoped>
.text {
font-size: 14px;
}
.item {
margin-bottom: 18px;
}
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both
}
.box-card {
width: 480px;
}
</style>

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

@ -15,7 +15,7 @@
</el-select>
</el-form-item>
<el-form-item label="任务执行状态">
<el-select v-model="taskReq.weigh" placeholder="请选择等级">
<el-select v-model="taskReq.status" placeholder="请选择等级">
<el-option label="请选择" value=""></el-option>
<el-option label="待执行" value="0"></el-option>
<el-option label="正在执行" value="1"></el-option>
@ -28,24 +28,18 @@
</el-form>
<!-- <el-button-->
<!-- v-hasPermi="['system:user:remove']"-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<el-col :span="1.5">
<el-button
icon="el-icon-delete"
v-hasPermi="['system:config:add']"
icon="el-icon-plus"
plain
size="mini"
type="danger"
@click="insertAdd()"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<!-- <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">-->
@ -122,7 +116,6 @@
<span style="margin-left: 10px" v-if="scope.row.status ==0 ">待执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==1 ">正在执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==2 ">执行完毕</span>
<span style="margin-left: 10px">{{ scope.row.status }}</span>
</template>
</el-table-column>
@ -133,7 +126,6 @@
<span style="margin-left: 10px" v-if="scope.row.status ==0 ">待执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==1 ">正在执行</span>
<span style="margin-left: 10px" v-if="scope.row.status ==2 ">执行完毕</span>
<span style="margin-left: 10px">{{ scope.row.status }}</span>
</template>
</el-table-column>
@ -145,7 +137,7 @@
icon="el-icon-pear"
size="mini"
type="text"
@click="update(scope.row)">执行</el-button>
@click="executeTask(scope.row)">执行</el-button>
<el-button
icon="el-icon-delete"
@ -155,10 +147,149 @@
</template>
</el-table-column>
</el-table>
<!-- 添加界面-->
<el-dialog title="添加任务信息" :visible.sync="dialogFormVisible">
<el-form :model="taskAddReq">
<el-form-item label="任务名称">
<el-input v-model="taskAddReq.name"></el-input>
</el-form-item>
<el-form-item label="优先级选择">
<el-select v-model="taskReq.weigh" placeholder="请选择等级">
<el-option label="请选择" value=""></el-option>
<el-option label="紧急" value="1"></el-option>
<el-option label="低" value="2"></el-option>
<el-option label="中" value="3"></el-option>
<el-option label="高" value="4"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="addTask()">确 定</el-button>
</div>
</el-dialog>
<!-- 添加任务详情设计-->
<el-dialog title="添加表" :visible.sync="taskInputAdd">
<el-form label-width="80px" :model="taskInputReq" ref="queryForm" :inline="true" class="demo-form-inline" size="small">
<el-form-item label="任务id">
<el-input v-model="taskInputReq.taskId"></el-input>
</el-form-item>
<el-form-item label="数据库id">
<el-input v-model="taskInputReq.databaseId"></el-input>
</el-form-item>
<el-form-item label="数据表">
<el-select v-model="taskReq.tableName" placeholder="请选择等级">
<el-option label="请选择" value="0"></el-option>
<span v-for="table in tableList">
<el-option :label=table.tableName :value=table.id :key=table.id></el-option>
</span>
</el-select>
</el-form-item>
<el-form-item label="表别名">
<el-input v-model="taskInputReq.tableAsName"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="taskInputAdd = false">取 消</el-button>
<el-button type="primary" @click="addTaskInput()">下一步</el-button>
</div>
</el-dialog>
<!-- 字段选择列表-->
<el-dialog title="添加表" :visible.sync="taskInputFieldAdd">
<el-table
:data="taskList"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
label="字段"
width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.id }}</span>
</template>
</el-table-column>
<el-table-column
label="类型/长度"
width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column
label="非空"
width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column
label="注释"
width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column
label="处理规则"
width="180">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.weigh ==1 ">非空规则</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==2 ">非空规则</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==3 ">非空规则</span>
<span style="margin-left: 10px" v-if="scope.row.weigh ==4 ">非空规则</span>
</template>
</el-table-column>
<el-table-column
label="表别名"
width="180">
<template slot-scope="scope">
<input type="text">
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="addTask()">确 定</el-button>
</div>
</el-dialog>
@ -175,7 +306,7 @@ 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 { selectTaskList } from '@/api/task/task'
import { addTask, deleteById, deleteByTaskId, selectTaskList, updateById } from '@/api/task/task'
export default {
//import引入的组件需要注入到对象中才能使用"
@ -186,10 +317,17 @@ export default {
return {
dialogFormVisible:false,
//任务设计添加表弹窗
taskInputAdd:false,
//选择字段弹窗
taskInputFieldAdd:false,
taskReq:{
},
taskAddReq:{},
taskInputReq:{},
taskList:[],
tableList:[],
};
},
//计算属性 类似于data概念",
@ -198,6 +336,31 @@ export default {
watch: {},
//方法集合",
methods: {
executeTask(){
this.taskInputAdd = true;
},
addTaskInput(){
this.taskInputAdd = false;
this.taskInputFieldAdd = true;
},
//添加页面展示
handleAdd(){
this.dialogFormVisible = true;
},
//添加任务
addTask(){
addTask(this.taskAddReq).then(res=>{
alert(res.msg)
if(res.code == 200){
location.reload();
}
});
},
//根据条件查询列表
findSelectTaskList(){
selectTaskList(this.taskReq).then(res=>{
console.log(res.data);
@ -206,10 +369,19 @@ export default {
})
},
insertAdd(){
updateById(){
},
handleDelete(row){
deleteByTaskId(row.getId).then(res=>{
alert(res.msg);
if(res.code == 200){
location.reload();
}
})
},
handleSelectionChange(row){
},