Merge remote-tracking branch 'origin/master'

master
陈思豪 2024-08-24 19:08:39 +08:00
commit df052fe59c
9 changed files with 232 additions and 34 deletions

View File

@ -4,7 +4,7 @@ import request from '@/utils/request'
export function selectEngineList(data){
return request({
url: "/engine/engine/getMaintenanceList",
method: "Get",
method: "post",
data:data
})
}

View File

@ -37,6 +37,15 @@ export function getInfo(id){
}
//测试连接
export function structure(data){
return request({
url: "/source/source/structure",
method: "post",
data:data
})
}
//测试连接
export function connectionTest(data){
return request({

View File

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

View File

@ -10,6 +10,24 @@ export function listUser(query) {
})
}
// 用户余额
export function userRecharge(data) {
return request({
url: '/money/alipay/recharge',
method: 'post',
params: data
})
}
// 查询用户余额
export function userBalance(userId) {
return request({
url: '/money/balance/' + userId,
method: 'get',
})
}
// 查询用户详细
export function getUser(userId) {
return request({

View File

@ -14,7 +14,7 @@
<el-form-item label="规则状态">
<el-input v-model="engine.status"></el-input>
</el-form-item>
<el-button @click="findSelectSourceList()">
<el-button @click="select()">
查询
</el-button>
</el-form>
@ -151,6 +151,47 @@
</el-table>
<!-- 分页-->
<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>
@ -168,13 +209,15 @@ export default {
return {
engineReq:{
pageNum:1,
pageSize:5
},
engine:{
},
arr:[],
dialogFormVisible:false
dialogFormVisible:false,
total:0
};
},
// data",
@ -183,6 +226,16 @@ export default {
watch: {},
//",
methods: {
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 =>{
@ -191,8 +244,9 @@ export default {
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){
@ -209,6 +263,9 @@ export default {
this.download('engine/engine/export', {
...this.engineReq
}, `source_${new Date().getTime()}.xlsx`)
},
select(){
this.findSelectSourceList();
}
},
// - 访this",

View File

@ -56,9 +56,9 @@
</el-button>
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible">
<el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" append-to-body width="60%">
<el-form :model="sourceAddReq">
<el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline">
<el-form-item label="接入源名称">
<el-input v-model="sourceAddReq.dataResourceName"></el-input>
</el-form-item>
@ -86,25 +86,74 @@
<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-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-card class="box-card">
<div slot="header" class="clearfix">
<span>连接池配置</span>
</div>
<el-form ref="form" :model="sourceAddReq" label-width="120px" :inline="true" class="demo-form-inline">
<el-form-item label="初始连接数量:" prop="initCount">
<el-input v-model="sourceAddReq.initCount" placeholder="初始连接数量"/>
</el-form-item>
<el-form-item label="最大连接数量:" prop="maxCount">
<el-input v-model="sourceAddReq.maxLinkNum" placeholder="最大连接数量"/>
</el-form-item>
<el-form-item label="最大等待时间:" prop="maxTime">
<el-input v-model="sourceAddReq.maxWaitTime" placeholder="最大等待时间"/>
</el-form-item>
<el-form-item label="最大等待次数:" prop="maxFrequency">
<el-input v-model="sourceAddReq.remark" placeholder="最大等待次数"/>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>其他信息</span>
</div>
<el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline">
<!-- <el-form-item label="是否初始化:" prop="status">-->
<!-- <el-radio-group v-model="sourceAddReq.status">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.yes_no"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="备注:">
<el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
</el-form-item>
</el-form>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button @click="textP()"></el-button>
<el-button @click="dialogFormVisible = false"> </el-button>
@ -219,6 +268,7 @@ import {connectionTest} from "@/api/etl/switch";
import {insertAdd} from "@/api/etl/switch";
import {deleteSource} from "@/api/etl/switch";
import {getInfo} from "@/api/etl/switch";
import {structure} from "@/api/etl/switch";
export default {
//import使"
@ -245,6 +295,13 @@ export default {
watch: {},
//",
methods: {
struceure(row){
structure(row).then(res=>{
if (res ===200){
alert("同步资产成功")
}
})
},
deleteSourceByIds(){
deleteSource(this.ids).then(res=>{
if(res.code===200){
@ -254,8 +311,8 @@ export default {
},
handleDelete(row){
deleteSource(row.id).then(res=>{
if(res.code===200){
alert("删除成功");
if (res.code===200){
location.reload();
}
})
},
@ -285,9 +342,9 @@ export default {
}
})
},
insertAdd(){
this.dialogFormVisible=true
},
findSelectSourceList(){
selectSourceList(this.SourceReq).then(res=>{

View File

@ -0,0 +1,30 @@
<template>
<div>
<span style="text-align: center">账户余额: {{ balance }}</span>
</div>
</template>
<script>
import {userBalance} from "@/api/system/user";
export default {
data() {
return {
balance: null, //
};
},
async created() {
try {
const userId = 1; // ID
const response = await userBalance(userId);
this.balance = response.data.balance; //
} catch (error) {
console.error('Error fetching user balance:', error);
}
},
};
</script>
<style scoped>
/* 添加样式 */
</style>

View File

@ -5,10 +5,17 @@
<span>手机号查询归属地</span>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
<span>{{'列表内容 ' }}</span>
<el-form :model="formLabelAlign">
<el-form-item placeholder="请输入手机号">
<el-input v-model="formLabelAlign.tel"></el-input>
</el-form-item>
</el-form>
<el-button @click="getPhonePlace"></el-button>
<span>省份{{this.formLabelAlign.province}}</span><br>
<span>城市{{this.formLabelAlign.city}}</span><br>
<span>区号{{this.formLabelAlign.areacode}}</span><br>
<span>邮编{{this.formLabelAlign.zip}}</span><br>
<span>运营商{{this.formLabelAlign.company}}</span>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
@ -33,14 +40,32 @@ export default {
data() {
//"
return {};
return {
formLabelAlign:{
province:"",
city:"",
areacode:"",
zip:"",
company:"",
},
};
},
// data",
computed: {},
//data",
watch: {},
//",
methods: {},
methods: {
getPhonePlace(){
getPhonePlace(this.formLabelAlign.tel).then((res)=>{
this.formLabelAlign.province=res.data.province;
this.formLabelAlign.city=res.data.city;
this.formLabelAlign.areacode=res.data.areacode;
this.formLabelAlign.zip=res.data.zip;
this.formLabelAlign.company=res.data.company;
})
}
},
// - 访this",
created() {
},

View File

@ -38,6 +38,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://172.13.1.1/prod-api`,
// target: `http://127.0.0.1/8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''