Merge remote-tracking branch 'origin/master'

master
陈思豪 2024-08-25 11:17:24 +08:00
commit fa95ea5f1f
2 changed files with 61 additions and 186 deletions

View File

@ -32,106 +32,59 @@
</el-button>
<!-- <el-button-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="insert()"-->
<!-- >新增-->
<!-- </el-button>-->
<el-button
icon="el-icon-delete"
plain
size="mini"
type="danger"
@click="insert()"
>新增
</el-button>
<!-- 添加或修改规则引擎对话框 -->
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
<el-form ref="form" :model="engine" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="规则名称" prop="name">
<el-input v-model="engine.name" placeholder="请输入规则名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规则编码" prop="engineCode">
<el-input v-model="engine.engineCode" placeholder="请输入规则编码"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="规则类型" prop="type">
<el-select v-model="engine.type" placeholder="请选择规则类型" style="width: 100%">
<el-option
v-for="dict in dict.type.rule_engine_type"
:key="dict.value"
:label="dict.label"
:value="Number(dict.value)"
></el-option>
</el-select>
</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-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
<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>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
<el-button @click="dialogFormVisible = false"> </el-button>
<el-button type="primary" @click="dialogFormVisible = false"> </el-button>
</div>
</el-dialog>
<el-table :data="arr" style="width: 100%">
<el-table-column label="编号" prop="id"></el-table-column>
@ -262,37 +215,9 @@ export default {
engine:{
},
//
title: "",
arr:[],
dialogFormVisible:false,
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"}
],
}
total:0
};
},
// data",
@ -301,41 +226,23 @@ export default {
watch: {},
//",
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) {
console.log(`每页 ${val}`);
this.engineReq.pageSize = val;
this.findSelectSourceList();
},
//
cancel() {
this.open = false;
this.reset();
},
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(this.engineReq).then(res=>{
this.arr=res.data.list;
@ -347,6 +254,11 @@ export default {
this.$message.success(res.msg || "删除成功")
})
},
handUpdate(){
update(this.engine).then(res =>{
this.$message.success(res.msg || "修改成功")
})
},
findSelectSourceExport(){
this.download('engine/engine/export', {
...this.engineReq

View File

@ -5,6 +5,7 @@
<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>
@ -13,6 +14,7 @@
<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>
@ -21,6 +23,7 @@
<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>
@ -29,6 +32,7 @@
<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>
@ -37,44 +41,12 @@
<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>-->
<!-- <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-item placeholder="请输入手机号">-->
<!-- <el-button @click="getPhonePlace"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <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>-->
<!-- </div>-->
<!-- <div>-->
<!-- <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>-->
</div>
</template>
@ -105,16 +77,7 @@ export default {
watch: {},
//",
methods: {
getPhonePlace(){
alert("111")
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() {