one-YI
/
cloud-ui
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复ID

dev.warn
chentaisen 2024-09-23 09:56:59 +08:00
parent e63bc9db11
commit c60c027cd9
2 changed files with 143 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
src/views/warning/rule/index.vue
View File

@ -9,54 +9,54 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="策略id" prop="strategyId">--> <!-- <el-form-item label="策略id" prop="strategyId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.strategyId"--> <!-- v-model="queryParams.strategyId"-->
<!-- placeholder="请输入策略id"--> <!-- placeholder="请输入策略id"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="报文数据类型id" prop="msgTypeId">--> <!-- <el-form-item label="报文数据类型id" prop="msgTypeId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.msgTypeId"--> <!-- v-model="queryParams.msgTypeId"-->
<!-- placeholder="请输入报文数据类型id"--> <!-- placeholder="请输入报文数据类型id"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="滑窗时间" prop="slideTime">--> <!-- <el-form-item label="滑窗时间" prop="slideTime">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.slideTime"--> <!-- v-model="queryParams.slideTime"-->
<!-- placeholder="请输入滑窗时间"--> <!-- placeholder="请输入滑窗时间"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="滑窗频率" prop="slideFrequency">--> <!-- <el-form-item label="滑窗频率" prop="slideFrequency">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.slideFrequency"--> <!-- v-model="queryParams.slideFrequency"-->
<!-- placeholder="请输入滑窗频率"--> <!-- placeholder="请输入滑窗频率"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="最大值" prop="maxValue">--> <!-- <el-form-item label="最大值" prop="maxValue">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.maxValue"--> <!-- v-model="queryParams.maxValue"-->
<!-- placeholder="请输入最大值"--> <!-- placeholder="请输入最大值"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="最小值" prop="minValue">--> <!-- <el-form-item label="最小值" prop="minValue">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.minValue"--> <!-- v-model="queryParams.minValue"-->
<!-- placeholder="请输入最小值"--> <!-- placeholder="请输入最小值"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -72,7 +72,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['platform:rule:add']" v-hasPermi="['platform:rule:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -83,7 +84,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['platform:rule:edit']" v-hasPermi="['platform:rule:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -94,7 +96,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['platform:rule:remove']" v-hasPermi="['platform:rule:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -104,21 +107,22 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['platform:rule:export']" v-hasPermi="['platform:rule:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="规则id" align="center" prop="id" /> <el-table-column label="规则id" align="center" prop="id"/>
<el-table-column label="规则名称" align="center" prop="ruleName" /> <el-table-column label="规则名称" align="center" prop="ruleName"/>
<el-table-column label="策略id" align="center" prop="strategyId" /> <el-table-column label="策略id" align="center" prop="strategyId"/>
<el-table-column label="报文数据类型id" align="center" prop="msgTypeId" /> <el-table-column label="报文数据类型id" align="center" prop="msgTypeId"/>
<el-table-column label="滑窗时间" align="center" prop="slideTime" /> <el-table-column label="滑窗时间" align="center" prop="slideTime"/>
<el-table-column label="滑窗频率" align="center" prop="slideFrequency" /> <el-table-column label="滑窗频率" align="center" prop="slideFrequency"/>
<el-table-column label="最大值" align="center" prop="maxValue" /> <el-table-column label="最大值" align="center" prop="maxValue"/>
<el-table-column label="最小值" align="center" prop="minValue" /> <el-table-column label="最小值" align="center" prop="minValue"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -127,14 +131,16 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['platform:rule:edit']" v-hasPermi="['platform:rule:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['platform:rule:remove']" v-hasPermi="['platform:rule:remove']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -151,25 +157,25 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="规则名称" prop="ruleName"> <el-form-item label="规则名称" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入规则名称" /> <el-input v-model="form.ruleName" placeholder="请输入规则名称"/>
</el-form-item> </el-form-item>
<el-form-item label="策略id" prop="strategyId"> <el-form-item label="策略id" prop="strategyId">
<el-input v-model="form.strategyId" placeholder="请输入策略id" /> <el-input v-model="form.strategyId" placeholder="请输入策略id"/>
</el-form-item> </el-form-item>
<el-form-item label="报文数据类型id" prop="msgTypeId"> <el-form-item label="报文数据类型id" prop="msgTypeId">
<el-input v-model="form.msgTypeId" placeholder="请输入报文数据类型id" /> <el-input v-model="form.msgTypeId" placeholder="请输入报文数据类型id"/>
</el-form-item> </el-form-item>
<el-form-item label="滑窗时间" prop="slideTime"> <el-form-item label="滑窗时间" prop="slideTime">
<el-input v-model="form.slideTime" placeholder="请输入滑窗时间" /> <el-input v-model="form.slideTime" placeholder="请输入滑窗时间"/>
</el-form-item> </el-form-item>
<el-form-item label="滑窗频率" prop="slideFrequency"> <el-form-item label="滑窗频率" prop="slideFrequency">
<el-input v-model="form.slideFrequency" placeholder="请输入滑窗频率" /> <el-input v-model="form.slideFrequency" placeholder="请输入滑窗频率"/>
</el-form-item> </el-form-item>
<el-form-item label="最大值" prop="maxValue"> <el-form-item label="最大值" prop="maxValue">
<el-input v-model="form.maxValue" placeholder="请输入最大值" /> <el-input v-model="form.maxValue" placeholder="请输入最大值"/>
</el-form-item> </el-form-item>
<el-form-item label="最小值" prop="minValue"> <el-form-item label="最小值" prop="minValue">
<el-input v-model="form.minValue" placeholder="请输入最小值" /> <el-input v-model="form.minValue" placeholder="请输入最小值"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -181,7 +187,7 @@
</template> </template>
<script> <script>
import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/warning/rule"; import {listRule, getRule, delRule, addRule, updateRule} from "/src/api/warning/rule";
export default { export default {
name: "Rule", name: "Rule",
@ -220,11 +226,13 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
} rule: {}
}; };
}, },
created() { created() {
this.queryParams.strategyId = this.$route.query.id
this.getList(); this.getList();
}, },
methods: { methods: {
@ -269,7 +277,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -311,12 +319,13 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除预警规则编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除预警规则编号为"' + ids + '"的数据项？').then(function () {
return delRule(ids); return delRule(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {

95
src/views/warning/strategy/index.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="车辆类型id" prop="carTypeId">--> <!-- <el-form-item label="车辆类型id" prop="carTypeId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.carTypeId"--> <!-- v-model="queryParams.carTypeId"-->
<!-- placeholder="请输入车辆类型id"--> <!-- placeholder="请输入车辆类型id"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="策略名称" prop="strategyName"> <el-form-item label="策略名称" prop="strategyName">
<el-input <el-input
v-model="queryParams.strategyName" v-model="queryParams.strategyName"
@ -17,14 +17,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="报文模版id" prop="msgId">--> <!-- <el-form-item label="报文模版id" prop="msgId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.msgId"--> <!-- v-model="queryParams.msgId"-->
<!-- placeholder="请输入报文模版id"--> <!-- placeholder="请输入报文模版id"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -40,7 +40,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['platform:strategy:add']" v-hasPermi="['platform:strategy:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -51,7 +52,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['platform:strategy:edit']" v-hasPermi="['platform:strategy:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -62,7 +64,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['platform:strategy:remove']" v-hasPermi="['platform:strategy:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -72,17 +75,18 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['platform:strategy:export']" v-hasPermi="['platform:strategy:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="strategyList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="strategyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="策略id" align="center" prop="id" /> <el-table-column label="策略id" align="center" prop="id"/>
<el-table-column label="车辆类型id" align="center" prop="carTypeId" /> <el-table-column label="车辆类型id" align="center" prop="carTypeId"/>
<el-table-column label="策略名称" align="center" prop="strategyName" /> <el-table-column label="策略名称" align="center" prop="strategyName"/>
<el-table-column label="报文模版id" align="center" prop="msgId" /> <el-table-column label="报文模版id" align="center" prop="msgId"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -91,14 +95,24 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['platform:strategy:edit']" v-hasPermi="['platform:strategy:edit']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['platform:strategy:remove']" v-hasPermi="['platform:strategy:remove']"
>删除</el-button> >删除
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleAddRule(scope.row)"
v-hasPermi="['platform:strategy:remove']"
>配置规则
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -115,13 +129,13 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="车辆类型id" prop="carTypeId"> <el-form-item label="车辆类型id" prop="carTypeId">
<el-input v-model="form.carTypeId" placeholder="请输入车辆类型id" /> <el-input v-model="form.carTypeId" placeholder="请输入车辆类型id"/>
</el-form-item> </el-form-item>
<el-form-item label="策略名称" prop="strategyName"> <el-form-item label="策略名称" prop="strategyName">
<el-input v-model="form.strategyName" placeholder="请输入策略名称" /> <el-input v-model="form.strategyName" placeholder="请输入策略名称"/>
</el-form-item> </el-form-item>
<el-form-item label="报文模版id" prop="msgId"> <el-form-item label="报文模版id" prop="msgId">
<el-input v-model="form.msgId" placeholder="请输入报文模版id" /> <el-input v-model="form.msgId" placeholder="请输入报文模版id"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -133,7 +147,7 @@
</template> </template>
<script> <script>
import { listStrategy, getStrategy, delStrategy, addStrategy, updateStrategy } from "/src/api/warning/strategy"; import {listStrategy, getStrategy, delStrategy, addStrategy, updateStrategy} from "/src/api/warning/strategy";
export default { export default {
name: "Strategy", name: "Strategy",
@ -168,8 +182,7 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {}
}
}; };
}, },
created() { created() {
@ -213,7 +226,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -252,15 +265,23 @@ export default {
} }
}); });
}, },
/** 删除按钮操作 */ /** 配置规则按钮操作 */
handleAddRule(row) {
this.$router.push({
path:'rule',
query:{id:row.id}
})
}, /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除预警策略编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除预警策略编号为"' + ids + '"的数据项？').then(function () {
return delStrategy(ids); return delStrategy(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {