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

Merge remote-tracking branch 'origin/master'

master
chaiyapeng 2024-08-25 11:50:12 +08:00
parent 905a67d1b8 8f18a71a79
commit 27d8cbadba
4 changed files with 224 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,106 +32,59 @@
</el-button> </el-button>
<!-- <el-button--> <el-button
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- plain--> plain
<!-- size="mini"--> size="mini"
<!-- type="danger"--> type="danger"
<!-- @click="insert()"--> @click="insert()"
<!-- >新增--> >新增
<!-- </el-button>--> </el-button>
<!-- 添加或修改规则引擎对话框 --> <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
<el-form ref="form" :model="engine" :rules="rules" label-width="80px"> <el-form :model="engine">
<el-row> <el-form-item label="接入源名称">
<el-col :span="12"> <el-input v-model="engine.id"></el-input>
<el-form-item label="规则名称" prop="name"> </el-form-item>
<el-input v-model="engine.name" placeholder="请输入规则名称"/> <el-form-item label="数据来源系统名称">
</el-form-item> <el-input v-model="engine.name"></el-input>
</el-col> </el-form-item>
<el-col :span="12"> <el-form-item label="主机地址">
<el-form-item label="规则编码" prop="engineCode"> <el-input v-model="engine.type"></el-input>
<el-input v-model="engine.engineCode" placeholder="请输入规则编码"/> </el-form-item>
</el-form-item> <el-form-item label="主机端口">
</el-col> <el-input v-model="engine.scope"></el-input>
</el-row> </el-form-item>
<el-row> <el-form-item label="数据接入类型">
<el-col :span="12"> <el-input v-model="engine.engineCode"></el-input>
<el-form-item label="规则类型" prop="type"> </el-form-item>
<el-select v-model="engine.type" placeholder="请选择规则类型" style="width: 100%"> <el-form-item label="数据库名称">
<el-option <el-input v-model="engine.isActivate"></el-input>
v-for="dict in dict.type.rule_engine_type" </el-form-item>
:key="dict.value" <el-form-item label="数据库用户">
:label="dict.label" <el-input v-model="engine.status"></el-input>
:value="Number(dict.value)" </el-form-item>
></el-option> <el-form-item label="数据库密码">
</el-select> <el-input v-model="engine.description"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规则级别" prop="scope">
<el-select v-model="engine.scope" placeholder="请选择规则级别" style="width: 100%">
<el-option
v-for="dict in dict.type.rule_engine_level"
:key="dict.value"
:label="dict.label"
:value="Number(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否激活" prop="isActivate">
<el-radio-group v-model="engine.isActivate">
<el-radio
v-for="dict in dict.type.rule_engine_activate_status"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规则状态" prop="status">
<el-radio-group v-model="engine.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规则描述">
<editor v-model="engine.description" :min-height="192"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="engine.remark" type="textarea" placeholder="请输入内容"/>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button @click="cancel">取 消</el-button> <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-table :data="arr" style="width: 100%"> <el-table :data="arr" style="width: 100%">
<el-table-column label="编号" prop="id"></el-table-column> <el-table-column label="编号" prop="id"></el-table-column>
@ -188,7 +141,7 @@
icon="el-icon-service" icon="el-icon-service"
size="mini" size="mini"
type="text" type="text"
@click="handUpdate(scope.row)">规则维护</el-button> @click="handUpdate(scope.row.id)">规则维护</el-button>
</template> </template>
@ -262,37 +215,9 @@ export default {
engine:{ engine:{
}, },
// 弹出层标题
title: "",
arr:[], arr:[],
dialogFormVisible:false, dialogFormVisible:false,
total:0, total:0
rules: {
name: [
{required: true, message: "规则名称不能为空", trigger: "blur"}
],
type: [
{required: true, message: "规则类型不能为空", trigger: "change"}
],
engineCode: [
{required: true, message: "规则编码不能为空", trigger: "blur"}
],
scope: [
{required: true, message: "规则级别不能为空", trigger: "change"}
],
isActivate: [
{required: true, message: "是否激活不能为空", trigger: "change"}
],
status: [
{required: true, message: "规则状态不能为空", trigger: "change"}
],
createBy: [
{required: true, message: "创建者不能为空", trigger: "blur"}
],
createTime: [
{required: true, message: "创建时间不能为空", trigger: "blur"}
],
}
}; };
}, },
//计算属性 类似于data概念", //计算属性 类似于data概念",
@ -301,41 +226,23 @@ export default {
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
update(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.getList();
this.open = false;
})
} else {
insert(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
this.open = false;
})
}
}
});
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.engineReq.pageSize = val; this.engineReq.pageSize = val;
this.findSelectSourceList(); this.findSelectSourceList();
}, },
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.engineReq.pageNum = val; this.engineReq.pageNum = val;
this.findSelectSourceList(); this.findSelectSourceList();
}, },
insert(){
this.dialogFormVisible = true
insert(this.engine).then(res =>{
this.$message.success(res.msg || "添加成功")
})
this.engine = {}
},
findSelectSourceList(){ findSelectSourceList(){
selectEngineList(this.engineReq).then(res=>{ selectEngineList(this.engineReq).then(res=>{
this.arr=res.data.list; this.arr=res.data.list;
@ -347,6 +254,11 @@ export default {
this.$message.success(res.msg || "删除成功") this.$message.success(res.msg || "删除成功")
}) })
}, },
handUpdate(){
update(this.engine).then(res =>{
this.$message.success(res.msg || "修改成功")
})
},
findSelectSourceExport(){ findSelectSourceExport(){
this.download('engine/engine/export', { this.download('engine/engine/export', {
...this.engineReq ...this.engineReq

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

@ -136,16 +136,16 @@
<span>其他信息</span> <span>其他信息</span>
</div> </div>
<el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline"> <el-form ref="form" :model="sourceAddReq" label-width="140px" :inline="true" class="demo-form-inline">
<!-- <el-form-item label="是否初始化：" prop="status">--> <el-form-item label="是否初始化：" prop="status">
<!-- <el-radio-group v-model="sourceAddReq.status">--> <el-radio-group v-model="sourceAddReq.status">
<!-- <el-radio--> <el-radio
<!-- v-for="dict in dict.type.yes_no"--> v-for="dict in dict.type.yes_no"
<!-- :key="dict.value"--> :key="dict.value"
<!-- :label="dict.value"--> :label="dict.value"
<!-- >{{ dict.label }}--> >{{ dict.label }}
<!-- </el-radio>--> </el-radio>
<!-- </el-radio-group>--> </el-radio-group>
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="备注："> <el-form-item label="备注：">
<el-input type="textarea" v-model="sourceAddReq.remark"></el-input> <el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
</el-form-item> </el-form-item>
@ -210,7 +210,10 @@
<el-table-column <el-table-column
label="是否初始化" label="是否初始化"
prop="name"> prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.yes_no" :value="scope.row.status"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

135
src/views/money/pay/index.vue 100644
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) { // 判断月份和几号是否大于10或者小于10
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>

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

@ -187,30 +187,30 @@
<!-- 添加任务详情设计--> <!-- 添加任务详情设计-->
<el-dialog title="添加表" :visible.sync="taskInputAdd"> <el-dialog title="添加表" :visible.sync="taskInputAdd">
<el-form label-width="80px" :model="taskInfoList" 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-form-item label="任务id">
<el-input v-model="taskInfoList.taskId"></el-input> <el-input v-model="taskInfo.taskId"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数据库id"> <el-form-item label="数据库id">
<el-input v-model="taskInfoList.databaseId"></el-input> <el-input v-model="taskInfo.databaseId"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数据表"> <el-form-item label="数据表">
<el-select v-model="taskInfoList.tableName" placeholder="请选择等级"> <el-select v-model="taskInfo.tableName" placeholder="请选择等级">
<el-option label="请选择" value="0"></el-option> <el-option label="请选择" value="0"></el-option>
<span v-for="table in taskInfoList"> <span v-for="table in taskInfoList">
<el-option :label=table.tableName :value=table.id :key=table.id></el-option> <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
</span> </span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="表别名"> <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-item>
</el-form> </el-form>
<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(taskInfo)">下一步</el-button>
</div> </div>
@ -340,6 +340,7 @@ export default {
taskInputReq:{}, taskInputReq:{},
taskList:[], taskList:[],
taskInfoList:[], taskInfoList:[],
taskInfo:{},
tableList:[], tableList:[],
structureList:[], structureList:[],
}; };
@ -350,9 +351,15 @@ export default {
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
//选择数据表改变数据
changeTableName(row){
console.log(row);
this.taskInfo = row;
},
//查询字段 //查询字段
findByInputId(row){ findByInputId(taskInfo){
findByInputId(row.id).then(res=>{ findByInputId(taskInfo.id).then(res=>{
this.structureList = res.data; this.structureList = res.data;
}) })
@ -370,9 +377,10 @@ export default {
this.taskInputList(); this.taskInputList();
}, },
addTaskInput(){
addTaskInput(taskInfo){
this.taskInputAdd = false; this.taskInputAdd = false;
this.findByInputId(); this.findByInputId(taskInfo);
this.taskInputFieldAdd = true; this.taskInputFieldAdd = true;
}, },