master
chentaisen 2024-08-27 11:47:00 +08:00
parent 367677a8ef
commit 1758155041
4 changed files with 165 additions and 68 deletions

View File

@ -91,34 +91,35 @@ export default {
const rows = res.data.rows
for (let i = 0; i < rows.length; i++) {
const r = flowNode.methods.toJsPlumbNode(rows[i])
nodeTypeList.forEach(v => {
if (r.node.type === v.type) {
r.node.typeName = v.typeName
r.node.logImg = v.logImg
r.node.log_bg_color = v.log_bg_color
}
this.data.nodeList.push({
id: r.node.id,
type: r.node.type,
typeName: r.node.typeName,
nodeName: r.node.nodeName,
top: r.node.top,
left: r.node.left
})
this.data.nodeList.push(r.node)
if (r.line) {
r.line.forEach(v => {
let flag = true
this.data.lineList.forEach(v2 =>{
if (v2.from === v.from && v2.to === v.to) {
flag = false
}
})
if (flag){
this.data.lineList.push({
from: v.from,
to: v.to,
label: "连线名称",
id: GenNonDuplicateID(8),
Remark: ""
});
}
this.data.lineList.push({
from: v.from,
to: v.to,
label: "连线名称",
id: GenNonDuplicateID(8),
Remark: ""
});
})
}
}
this.data.nodeList.forEach(node => {
nodeTypeList.forEach(v => {
if (node.type === v.type) {
node.typeName = v.typeName
node.logImg = v.logImg
node.log_bg_color = v.log_bg_color
}
})
})
// console.log(data)
console.log(this.data)
})

View File

@ -138,8 +138,6 @@ export default {
/** jsPlumb节点类型 --> 数据库节点类型 */
toMysqlNode(node,preLine,nextLine){
return {
id: node.authId,
nodeType: node.type,
nodeCode: node.id,
nodeName: node.nodeName,
nodePositionTop: node.top,
@ -152,7 +150,6 @@ export default {
/** 数据库节点类型 --> jsPlumb节点类型 */
toJsPlumbNode(nodeInfo){
const node = {
authId: nodeInfo.id,
id: nodeInfo.nodeCode,
type: nodeInfo.nodeType,
nodeName: nodeInfo.nodeName,

View File

@ -9,15 +9,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务触发器" prop="taskWebhook">
<el-input
v-model="queryParams.taskWebhook"
placeholder="请输入任务触发器"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="启用状态" prop="state">
<el-select v-model="queryParams.state" placeholder="请选择启用状态" clearable>
<el-option
v-for="dict in dict.type.sys_enable_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-input
v-model="queryParams.state"
placeholder="请输入启用状态"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
@ -73,17 +79,13 @@
<el-table v-loading="loading" :data="questList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="任务编码" align="center" prop="taskCode" />
<el-table-column label="任务名称" align="center" prop="taskName" />
<el-table-column label="任务触发器" align="center" prop="taskWebhook" />
<el-table-column label="规则编码" align="center" prop="ruleCode" />
<el-table-column label="任务类型" align="center" prop="taskType" />
<el-table-column label="任务内容" align="center" prop="taskData" />
<el-table-column label="启用状态" align="center" prop="state">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_enable_status" :value="scope.row.state"/>
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="state" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -131,18 +133,11 @@
<el-form-item label="规则编码" prop="ruleCode">
<el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
</el-form-item>
<el-form-item label="任务内容">
<editor v-model="form.taskData" :min-height="192"/>
<el-form-item label="任务类型" prop="task_type">
<el-input v-model="form.taskType" placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="启用状态" prop="state">
<el-select v-model="form.state" placeholder="请选择启用状态">
<el-option
v-for="dict in dict.type.sys_enable_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-input v-model="form.state" placeholder="请输入启用状态" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -154,12 +149,10 @@
</template>
<script>
import { listQuest, getQuest, delQuest, addQuest, updateQuest } from "/src/api/quest/quest";
import dict from "../../../utils/dict";
import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "@/api/quest/quest";
export default {
name: "Quest",
dicts: ['sys_enable_status'],
data() {
return {
//
@ -203,11 +196,11 @@ export default {
this.getList();
},
methods: {
dict,
/** 查询任务列表 */
getList() {
this.loading = true;
listQuest(this.queryParams).then(response => {
console.log(response)
this.questList = response.data.rows;
this.total = response.data.total;
this.loading = false;
@ -227,7 +220,6 @@ export default {
taskWebhook: null,
ruleCode: null,
taskType: null,
taskData: null,
state: null,
createBy: null,
createTime: null,
@ -250,7 +242,7 @@ export default {
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@ -292,13 +284,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项?').then(function () {
this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项?').then(function() {
return delQuest(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {

View File

@ -31,6 +31,91 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['rule:rule:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['rule:rule:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['rule:rule:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['rule:rule:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<!-- <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">-->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="主键" align="center" prop="id" />-->
<!-- <el-table-column label="规则名称" align="center" prop="name" />-->
<!-- <el-table-column label="规则类型" align="center" prop="ruleType" />-->
<!-- <el-table-column label="是否激活" align="center" prop="isActivate" />-->
<!-- <el-table-column label="规则描述" align="center" prop="ruleDesc" />-->
<!-- <el-table-column label="规则代码" align="center" prop="ruleCode" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleMaintain(scope.row)"-->
<!-- v-hasPermi="['rule:rule:remove']"-->
<!-- >规则维护</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['rule:rule:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['rule:rule:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<el-descriptions class="margin-top" title="规则版本" :column="3" border>
<template slot="extra">
@ -95,9 +180,17 @@
</el-descriptions-item>
</el-descriptions>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
<br><br>
<el-row :gutter="10">
<!-- <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>-->
<el-col :span="12" v-for="customer in ruleAndEditionList">
<el-card class="box-card">
@ -149,13 +242,13 @@
</template>
{{ customer.ruleKind }}
</el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- <i class="el-icon-user"></i>-->
<!-- 版本名称-->
<!-- </template>-->
<!-- {{ customer.name }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
版本名称
</template>
{{ customer.name }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
@ -192,6 +285,21 @@
</el-descriptions>
</div>
<!-- <el-popconfirm-->
<!-- confirm-button-text='好的'-->
<!-- cancel-button-text='不用了'-->
<!-- icon="el-icon-info"-->
<!-- icon-color="red"-->
<!-- title="这是一段内容确定删除吗?"-->
<!-- @confirm="handleDelete(ruleAndVersion.id)"-->
<!-- >-->
<!-- <el-button style="float: right; padding: 5px ;margin: 0 5px" slot="reference" type="danger"-->
<!-- icon="el-icon-delete" circle></el-button>-->
<!-- </el-popconfirm>-->
<!-- <el-button style="float: right; padding: 5px ;margin: 0 5px" type="primary" icon="el-icon-edit"-->
<!-- @click="handleUpdate(ruleAndVersion.id)" circle></el-button>-->
</div>
</el-card>
</el-col>
@ -221,7 +329,7 @@
<el-form-item label="内容" prop="ruleContent">
<el-input v-model="form.ruleContent" placeholder="请输入内容"/>
</el-form-item>
<el-form-item label="版本id" prop="ruleId">
<el-form-item label="内容" prop="ruleId">
<el-input v-model="form.ruleId" placeholder="请输入内容"/>
</el-form-item>
@ -236,7 +344,7 @@
<script>
import {getRule, delRule, updateRule} from "/src/api/rule/rule";
import {getEditionList, addRule, disable, enable} from "@/api/rule/ruleEdition";
import {getEditionList, addRule} from "@/api/rule/ruleEdition";
export default {
name: "Rule",
@ -290,7 +398,7 @@ export default {
ruleActivate: '',
status: '',
ruleContent: '',
ruleId: 1,
ruleId: '',
},
//
rules: {