Merge remote-tracking branch 'origin/master'

master
chaiyapeng 2024-08-23 09:28:50 +08:00
commit 3339c51018
4 changed files with 98 additions and 106 deletions

View File

@ -9,33 +9,35 @@ export function selectEngineList(data){
}) })
} }
//导出
export function selectSourceExport(data){
export function insert(data){
return request({ return request({
url: "/source/source/export", url: "/engine/engine/insert",
method: "POST", method: "post",
data:data
})
}
export function update(data){
return request({
url: "/engine/engine/update",
method: "post",
data:data data:data
}) })
} }
//新增
export function insertAdd(data){
return request({
url: "/source/source/insert",
method: "get",
data:data
})
}
export function del(id){
//获取基本信息
export function getInfo(id){
return request({ return request({
url: "/source/source/id", url: "/engine/engine/delete/" + id,
method: "get", method: "post",
data:id
}) })
} }

View File

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

View File

@ -20,16 +20,6 @@
</el-form> </el-form>
<!-- <el-button-->
<!-- v-hasPermi="['tool:gen:import']"-->
<!-- icon="el-icon-upload"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="info"-->
<!-- @click="findSelectSourceExport"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- icon="el-icon-delete"--> <!-- icon="el-icon-delete"-->
@ -41,61 +31,42 @@
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">--> <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
<!-- <el-form :model="sourceAddReq">--> <el-form :model="engine">
<!-- <el-form-item label="接入源名称">--> <el-form-item label="接入源名称">
<!-- <el-input v-model="sourceAddReq.dataResourceName"></el-input>--> <el-input v-model="engine.id"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="数据来源系统名称">--> <el-form-item label="数据来源系统名称">
<!-- <el-input v-model="sourceAddReq.dataSourcesSystemName"></el-input>--> <el-input v-model="engine.name"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="主机地址">--> <el-form-item label="主机地址">
<!-- <el-input v-model="sourceAddReq.host"></el-input>--> <el-input v-model="engine.type"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="主机端口">--> <el-form-item label="主机端口">
<!-- <el-input v-model="sourceAddReq.port"></el-input>--> <el-input v-model="engine.scope"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="数据接入类型">--> <el-form-item label="数据接入类型">
<!-- <el-input v-model="sourceAddReq.databaseType"></el-input>--> <el-input v-model="engine.engineCode"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="数据库名称">--> <el-form-item label="数据库名称">
<!-- <el-input v-model="sourceAddReq.databaseName"></el-input>--> <el-input v-model="engine.isActivate"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="数据库用户">--> <el-form-item label="数据库用户">
<!-- <el-input v-model="sourceAddReq.username"></el-input>--> <el-input v-model="engine.status"></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="数据库密码">--> <el-form-item label="数据库密码">
<!-- <el-input v-model="sourceAddReq.password"></el-input>--> <el-input v-model="engine.description"></el-input>
<!-- </el-form-item>--> </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>--> </el-form>
<!-- <div slot="footer" class="dialog-footer">--> <div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormVisible = false">测试</el-button>--> <el-button @click="dialogFormVisible = false"> </el-button>
<!-- <el-button @click="dialogFormVisible = false"> </el-button>--> <el-button type="primary" @click="dialogFormVisible = insert"> </el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> </el-button>--> </div>
<!-- </div>--> </el-dialog>
<!-- </el-dialog>-->
@ -146,23 +117,28 @@
<el-table-column <el-table-column
align="right"> align="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
icon="el-icon-pear"
size="mini"
type="text"
@click="update(scope.row)">规则维护</el-button>
<el-button <el-button
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row.id)">删除</el-button>
<el-button <el-button
icon="el-icon-service" icon="el-icon-service"
size="mini" size="mini"
type="text" type="text"
@click="struceure(scope.row)">修改</el-button> @click="handUpdate(scope.row.id)">规则维护</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="findSelectSourceExport"
v-hasPermi="['source:data:export']"
>导出
</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -182,8 +158,8 @@
//jsjsjson, //jsjsjson,
//import from ', //import from ',
import {insertAdd} from "@/api/etl/switch"; import {insertAdd} from "@/api/etl/switch";
import {selectEngineList} from "@/api/engine/engine"; import {insert, selectEngineList} from "@/api/engine/engine";
import {selectList} from "@/api/pay/customer"; import {del, selectList, update} from "@/api/pay/customer";
export default { export default {
//import使" //import使"
components: {}, components: {},
@ -192,14 +168,12 @@ export default {
//" //"
return { return {
// dialogFormVisible:false,
// SourceReq:{
//
// },
engine:{ engine:{
}, },
arr:[], arr:[],
dialogFormVisible:false
}; };
}, },
// data", // data",
@ -208,15 +182,31 @@ export default {
watch: {}, watch: {},
//", //",
methods: { methods: {
selectList, insert(){
// insertAdd(){ insert(this.engine).then(res =>{
// this.dialogFormVisible=true this.$message.success(res.msg || "添加成功")
// }, })
},
findSelectSourceList(){ findSelectSourceList(){
selectEngineList().then(res=>{ selectEngineList().then(res=>{
this.arr=res.data; this.arr=res.data;
}) })
}, },
handleDelete(id){
del(id).then(res =>{
this.$message.success(res.msg || "删除成功")
})
},
handUpdate(){
update(this.engine).then(res =>{
this.$message.success(res.msg || "修改成功")
})
},
findSelectSourceExport(){
selectEngineList().then(res=>{
this.arr=res.data;
})
}
}, },
// - 访this", // - 访this",
created() { created() {

View File

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