Merge remote-tracking branch 'origin/master'

master
lwj 2024-08-25 11:48:58 +08:00
commit 8f18a71a79
7 changed files with 254 additions and 55 deletions

View File

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

View File

@ -35,4 +35,20 @@ export function deleteByTaskId(id) {
})
}
//获得所有数据结构信息
export function taskInputList() {
return request({
url: "/task/taskInput/list",
method: "GET",
})
}
//获得所有数据结构信息
export function findByInputId(id) {
return request({
url: "/task/findByInputId/"+id,
method: "POST",
})
}

View File

@ -69,6 +69,7 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_ID', user.userId)
localStorage.setItem('userId', user.userId)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
resolve(res)

View File

@ -0,0 +1,135 @@
<template>
<el-card class="box-card">
<ul class="msg-box">
<li>
<h4>我要支付</h4>
</li>
<li>
<h4 style="margin-bottom: 15px;">支付金额</h4>
<el-radio-group v-model="amountVal" @change="amountChange">
<el-radio border :label="''+ 100">充值100</el-radio>
<el-radio border :label="''+ 500">充值500</el-radio>
<el-radio border :label="''+ 1000">充值1000</el-radio>
<el-radio border :label="''+ 2000">充值2000</el-radio>
<el-radio border :label="''+ 5000">充值5000</el-radio>
<el-radio border :label="''">自定义</el-radio>
</el-radio-group>
</li>
<li>
<h4 style="margin-bottom: 15px;">支付方式</h4>
<el-radio-group v-model="rechargeParams.paymentType" @change="paymentTypeChange">
<el-radio border :label="''+ 1">支付宝</el-radio>
<el-radio border :label="''+ 0">微信</el-radio>
</el-radio-group>
</li>
<li>
<h4 style="margin-bottom: 15px;">支付金额</h4>
<el-input :disabled="disabled" clearable v-model="rechargeParams.totalAmt" placeholder="请输入金额" style="width: 150px;"></el-input>
</li>
</ul>
<div style="text-align: center; margin-top: 30px;">
<el-button type="primary" @click="surePay"></el-button>
</div>
</el-card>
</template>
<script>
import { userRecharge } from "@/api/system/user";
export default {
data() {
return {
amountVal: '',
disabled: false,
//
returnUrl:'http://localhost:8090/#/entertainment/payment',
//
rechargeParams: {
"totalAmt": '', //
"paymentType": "0", //[0:,1:,2:,3:]
"transType": "0" //[0:,1:]
}
}
},
methods: {
//
amountChange(val) {
this.rechargeParams.totalAmt = val;
if (val === '') {
this.disabled = false
} else {
this.disabled = true
}
},
//
paymentTypeChange(val) {
this.rechargeParams.paymentType = val
},
//
async surePay() {
if (this.rechargeParams.totalAmt === '') {
this.$message.warning('请输入金额');
return;
}
if (this.rechargeParams.paymentType === '0') {
} else if (this.rechargeParams.paymentType === '1') {
let praem = {
// 便
outTradeNo:this.getProjectNum() + Math.floor(Math.random() * 10000),
//
totalAmount:this.rechargeParams.totalAmt,
//
returnUrl:this.returnUrl,
//
subject:'支付金额',
//
productCode:'FAST_INSTANT_TRADE_PAY'
}
userRecharge(praem).then(code => {
if (code.code === 200) {
//
this.$message.success('支付宝支付')
const payDiv = document.getElementById('payDiv');
if (payDiv) {
document.body.removeChild(payDiv);
}
const div = document.createElement('div');
div.id = 'payDiv';
div.innerHTML = code.data;
document.body.appendChild(div);
document.getElementById('payDiv').getElementsByTagName('form')[0].submit();
}
})
}
},
//
getProjectNum () {
const projectTime = new Date() //
const Year = projectTime.getFullYear() // IE.
const Month = projectTime.getMonth() + 1 //
const Day = projectTime.getDate() //
var CurrentDate = Year
if (Month >= 10) { // 1010
CurrentDate += Month
} else {
CurrentDate += '0' + Month
}
if (Day >= 10) {
CurrentDate += Day
} else {
CurrentDate += '0' + Day
}
return CurrentDate
}
}
}
</script>
<style scoped>
/* 信息列表样式 */
.msg-box > li {
list-style: none;
border-bottom: 1px solid #c5c5c5;
padding: 20px 10px;
}
</style>

View File

@ -1,10 +1,13 @@
<template>
<div>
<h1>用户余额</h1>
<p>余额{{ userBalanceData.userBalance || '加载中...' }}</p>
<el-card style="margin-top: 50px;">
<h1>用户余额</h1>
<p>余额{{ userBalanceData.userBalance || '加载中...' }}</p>
</el-card>
</div>
</template>
<script>
import { userBalance } from "@/api/system/user"; // userBalance@/api/money
@ -23,7 +26,7 @@ export default {
async fetchUserBalance() {
try {
const userId = localStorage.getItem('userId');
console.log(userId)// userIdlocalStorage
console.log(userId)// userIdlocalStorage
if (!userId) {
this.userBalanceData = {userBalance: '未登录'};
return;

View File

@ -1,31 +1,52 @@
<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>
<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">
<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>
<el-row :gutter="12">
<el-col :span="8">
<el-card shadow="hover">
<div slot="header" class="clearfix">
<span>手机号查询归属地</span>
<el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="hover">
<div slot="header" class="clearfix">
<span>IP查询归属地</span>
<el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="hover">
<div slot="header" class="clearfix">
<span>新闻头条</span>
<el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="hover">
<div slot="header" class="clearfix">
<span>气象预警</span>
<el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="hover">
<div slot="header" class="clearfix">
<span>生辰助手</span>
<el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
<el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
@ -56,15 +77,7 @@ export default {
watch: {},
//",
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

@ -187,30 +187,30 @@
<!-- 添加任务详情设计-->
<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 label-width="80px" :model="taskInfo" ref="queryForm" :inline="true" class="demo-form-inline" size="small">
<el-form-item label="任务id">
<el-input v-model="taskInputReq.taskId"></el-input>
<el-input v-model="taskInfo.taskId"></el-input>
</el-form-item>
<el-form-item label="数据库id">
<el-input v-model="taskInputReq.databaseId"></el-input>
<el-input v-model="taskInfo.databaseId"></el-input>
</el-form-item>
<el-form-item label="数据表">
<el-select v-model="taskReq.tableName" placeholder="请选择等级">
<el-select v-model="taskInfo.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 v-for="table in taskInfoList">
<el-option @select="changeTableName(table)" :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-input v-model="taskInfo.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>
<el-button type="primary" @click="addTaskInput(taskInfo)"></el-button>
</div>
@ -220,14 +220,12 @@
<el-dialog title="添加表" :visible.sync="taskInputFieldAdd">
<el-table
:data="taskList"
:data="structureList"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
@ -312,7 +310,15 @@ 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 { addTask, deleteById, deleteByTaskId, selectTaskList, updateById } from '@/api/task/task'
import {
addTask,
deleteById,
deleteByTaskId,
findByInputId,
selectTaskList,
taskInputList,
updateById
} from '@/api/task/task'
export default {
//import使"
@ -333,7 +339,10 @@ export default {
taskAddReq:{},
taskInputReq:{},
taskList:[],
taskInfoList:[],
taskInfo:{},
tableList:[],
structureList:[],
};
},
// data",
@ -342,13 +351,36 @@ export default {
watch: {},
//",
methods: {
//
changeTableName(row){
console.log(row);
this.taskInfo = row;
},
//
findByInputId(taskInfo){
findByInputId(taskInfo.id).then(res=>{
this.structureList = res.data;
})
},
//
taskInputList(){
taskInputList().then(res=>{
this.taskInfoList = res.data;
});
},
executeTask(){
this.taskInputAdd = true;
this.taskInputList();
},
addTaskInput(){
addTaskInput(taskInfo){
this.taskInputAdd = false;
this.findByInputId(taskInfo);
this.taskInputFieldAdd = true;
},