wuzudaniu
/
cloud-ui
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.qinmian.online/wuzudaniu/cloud-ui into dev.fault

dev.fault
YangPeng 2024-10-07 11:16:27 +08:00
parent 2f0e8b690a 051447962b
commit c6f4c91bea
6 changed files with 265 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/car/car.js
View File

@ -42,4 +42,3 @@ export function delCar(id) {
method: 'delete'
})
}

10
src/api/car/type.js 100644
View File

@ -0,0 +1,10 @@
import request from "@/utils/request";
//查询所有的车辆类型
export function listType(){
return request({
url: '/car/sysType/list',
method: 'get'
})
}

9
src/api/platform/strategy.js
View File

@ -1,5 +1,6 @@
import request from '@/utils/request'
// 查询预警策略列表
export function listStrategy(query) {
return request({
@ -41,4 +42,12 @@ export function delStrategy(id) {
url: '/warn/strategy/' + id,
method: 'delete'
})
}

167
src/views/car/car/index.vue
View File

@ -1,6 +1,6 @@
<template>
<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="82px">
<el-form-item label="车辆VIN码" prop="carVin">
<el-input
v-model="queryParams.carVin"
@ -40,7 +40,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['car:car:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -51,7 +52,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['car:car:edit']"
>修改</el-button>
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -62,7 +64,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['car:car:remove']"
>删除</el-button>
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -72,7 +75,8 @@
size="mini"
@click="handleExport"
v-hasPermi="['car:car:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -82,13 +86,9 @@
<el-table-column label="自增主键" align="center" prop="id"/>
<el-table-column label="车辆VIN码" align="center" prop="carVin"/>
<el-table-column label="车辆车牌号" align="center" prop="carPlate"/>
<el-table-column label="车辆品牌;" align="center" prop="carBrand" />
<el-table-column label="车辆品牌" align="center" prop="carBrand"/>
<el-table-column label="车辆型号" align="center" prop="carModel"/>
<el-table-column label="车辆车型" align="center" prop="carType"/>
<el-table-column label="车辆电机厂商" align="center" prop="carMotorManufacturer" />
<el-table-column label="电机型号" align="center" prop="carMotorModel" />
<el-table-column label="车辆电池厂商" align="center" prop="carBatteryManufacturer" />
<el-table-column label="电池型号" align="center" prop="carBatteryModel" />
<el-table-column label="围栏组编码" align="center" prop="groupCode"/>
<el-table-column label="启用状态" align="center" prop="state"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -99,21 +99,22 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['car:car:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['car:car:remove']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAddStrategy(scope.row)"
v-hasPermi="['car:car:add']"
>添加策略信息</el-button>
>删除
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-s-order"-->
<!-- @click="handleAddStrategy(scope.row)"-->
<!-- >详细信息</el-button>-->
</template>
</el-table-column>
</el-table>
@ -128,24 +129,28 @@
<!-- 添加或修改车辆基础信息对话框 -->
<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="82px">
<el-form-item label="车辆VIN码" prop="carVin">
<el-input v-model="form.carVin" placeholder="请输入车辆VIN码"/>
</el-form-item>
<el-form-item label="车辆车牌号" prop="carPlate">
<el-input v-model="form.carPlate" placeholder="请输入车辆车牌号"/>
</el-form-item>
<el-form-item label="车辆电机厂商" prop="carMotorManufacturer">
<el-input v-model="form.carMotorManufacturer" placeholder="请输入车辆电机厂商" />
<el-form-item label="车辆品牌" prop="carBrand">
<el-input v-model="form.carBrand" placeholder="请输入车辆品牌"/>
</el-form-item>
<el-form-item label="电机型号" prop="carMotorModel">
<el-input v-model="form.carMotorModel" placeholder="请输入电机型号" />
<el-form-item label="车辆型号" prop="carModel">
<el-input v-model="form.carModel" placeholder="请输入车辆型号"/>
</el-form-item>
<el-form-item label="车辆电池厂商" prop="carBatteryManufacturer">
<el-input v-model="form.carBatteryManufacturer" placeholder="请输入车辆电池厂商" />
</el-form-item>
<el-form-item label="电池型号" prop="carBatteryModel">
<el-input v-model="form.carBatteryModel" placeholder="请输入电池型号" />
<el-form-item label="车辆车型" prop="carType">
<el-select v-model="form.carType" placeholder="请选择报文模版id" :change="getCarTypeList">
<el-option
v-for="item in sysCarType"
:key="item.id"
:label="item.sysTypeName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="围栏组编码" prop="groupCode">
<el-input v-model="form.groupCode" placeholder="请输入围栏组编码"/>
@ -156,36 +161,19 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
</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>
</div>
</el-dialog>
<!-- 添加预警策略对话框 -->
<el-dialog :title="title" :visible.sync="beginOpen" width="500px" append-to-body>
<el-form ref="formList" :model="formList" :rules="rules" label-width="80px">
<el-form-item label="车辆类型id" prop="carTypeId">
<el-input v-model="formList.carTypeId" placeholder="请输入车辆类型id" />
</el-form-item>
<el-form-item label="策略名称" prop="strategyName">
<el-input v-model="formList.strategyName" placeholder="请输入策略名称" />
</el-form-item>
<el-form-item label="报文模版id" prop="msgId">
<!-- <el-input v-model="formList.msgId" placeholder="请输入报文模版id" />-->
<el-select v-model="formList.msgId" placeholder="请选择报文模版id">
<el-form-item label="策略信息" prop="strategyId">
<el-select v-model="form.msgId" placeholder="请选择报文模版id">
<el-option
v-for="item in templateList"
:key="item.messageTemplateId"
:label="item.messageTemplateName"
:value="item.messageTemplateId">
v-for="item in strategyList"
:key="item.id"
:label="item.strategyName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAddForm">确 定</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -195,8 +183,8 @@
<script>
import {listCar, getCar, delCar, addCar, updateCar} from "/src/api/car/car";
import {templateList} from "@/api/car/message/template";
import {addStrategy} from "@/api/platform/strategy";
import {addStrategy, listStrategy} from "@/api/platform/strategy";
import {listType} from "@/api/car/type";
export default {
name: "Car",
@ -217,6 +205,8 @@ export default {
// 车辆基础信息表格数据
carList: [],
templateList: [],
//车辆类型
sysCarType: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -234,15 +224,25 @@ export default {
state: null,
},
// 表单参数
form: {},
form: {
carVin: null,
carPlate: null,
carBrand: null,
carModel: null,
carType: null,
groupCode: null,
state: null,
remark: null,
msgId: null
},
formList: {},
// 表单校验
rules: {
}
rules: {}
};
},
created() {
this.getList();
this.getListType();
},
methods: {
/** 查询车辆基础信息列表 */
@ -254,6 +254,11 @@ export default {
this.loading = false;
});
},
getListType() {
listType().then(res => {
this.sysCarType = res.data.rows;
})
},
// 取消按钮
cancel() {
this.open = false;
@ -268,12 +273,6 @@ export default {
carBrand: null,
carModel: null,
carType: null,
carLastJoinTime: null,
carLastOfflineTime: null,
carMotorManufacturer: null,
carMotorModel: null,
carBatteryManufacturer: null,
carBatteryModel: null,
groupCode: null,
state: null,
createBy: null,
@ -282,7 +281,6 @@ export default {
updateTime: null,
remark: null
};
this.resetForm("form");
},
//初始化
@ -316,21 +314,11 @@ export default {
this.open = true;
this.title = "添加车辆基础信息";
},
/** 添加策略信息按钮 **/
handleAddStrategy(row) {
this.init();
const id = row.id || this.ids
getCar(id).then(response => {
this.formList.carTypeId = response.data.id;
this.beginOpen = true;
this.title ="添加策略信息";
});
templateList().then(response => {
this.templateList = response.data;
console.log(this.templateList);
});
/** 离焦获取策略信息 **/
getCarTypeList(carType) {
listStrategy({sysTypeId: carType}).then(res => {
this.strategyList = res.data;
})
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -340,8 +328,14 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改车辆基础信息";
this.listStrategy(response.data.carType)
});
},
listStrategy(sysTypeId) {
listStrategy({sysTypeId: sysTypeId}).then(res => {
this.strategyList = res.data.rows;
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -362,14 +356,7 @@ export default {
}
});
},
/** 添加策略信息**/
submitAddForm(){
addStrategy(this.formList).then(response => {
this.$modal.msgSuccess("添加策略信息成功");
this.beginOpen = false;
this.getList();
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
@ -378,9 +365,9 @@ export default {
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
this.download('car/car/export', {

138
src/views/platform/rule/index.vue
View File

@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="策略id" prop="strategyId">
<el-form-item label="策略名称" prop="strategyId">
<el-input
v-model="queryParams.strategyId"
placeholder="请输入策略id"
@ -17,14 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报文数据类型id" prop="msgTypeId">
<el-input
v-model="queryParams.msgTypeId"
placeholder="请输入报文数据类型id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="滑窗时间" prop="slideTime">
<el-input
v-model="queryParams.slideTime"
@ -41,22 +33,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="最大值" prop="maxValue">
<el-input
v-model="queryParams.maxValue"
placeholder="请输入最大值"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="最小值" prop="minValue">
<el-input
v-model="queryParams.minValue"
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>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -117,8 +93,9 @@
<el-table-column label="报文数据类型id" align="center" prop="msgTypeId" />
<el-table-column label="滑窗时间" align="center" prop="slideTime" />
<el-table-column label="滑窗频率" align="center" prop="slideFrequency" />
<el-table-column label="最大值" align="center" prop="maxValue" />
<el-table-column label="最小值" align="center" prop="minValue" />
<el-table-column label="数据频率名称" align="center" prop="slideData" />
<el-table-column label="数据频率最大值" align="center" prop="slideMaxNum" />
<el-table-column label="数据频率最小值" align="center" prop="slideMinNum" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -150,26 +127,53 @@
<!-- 添加或修改预警规则对话框 -->
<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-item label="策略名称" prop="strategyId">
<el-select v-model="form.strategyId" placeholder="请选择策略模版id" @change="getFindByTemplateValue">
<el-option
v-for="item in strategyList"
:key="item.id"
:label="item.strategyName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="规则名称" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入规则名称" />
</el-form-item>
<el-form-item label="策略id" prop="strategyId">
<el-input v-model="form.strategyId" placeholder="请输入策略id" />
</el-form-item>
<el-form-item label="报文数据类型id" prop="msgTypeId">
<el-input v-model="form.msgTypeId" placeholder="请输入报文数据类型id" />
<el-select ref="select" v-model="form.msgTypeId" multiple placeholder="请选择报文数据名称">
<el-option
v-for="item in templateValueList"
:key="item.messageId"
:label="item.messageCode"
:value="item.messageId">
<!-- <el-checkbox @change="clickBox(item.messageId)" :value ="value.includes(item.messageId)" :label="item.messageCode"></el-checkbox>-->
</el-option>
</el-select>
</el-form-item>
<el-form-item label="滑窗时间" prop="slideTime">
<el-input v-model="form.slideTime" placeholder="请输入滑窗时间" />
<el-slider v-model="form.slideTime" :min="1" :max="1000"></el-slider>
<el-input-number v-model="form.slideTime" :min="1" :max="1000"></el-input-number>
</el-form-item>
<el-form-item label="滑窗频率" prop="slideFrequency">
<el-input v-model="form.slideFrequency" placeholder="请输入滑窗频率" />
<el-select v-model="form.slideFrequency" placeholder="请选择滑窗频率">
<el-option value="1:2">1:2</el-option>
<el-option value="1:5">1:5</el-option>
<el-option value="1:10">1:10</el-option>
<el-option value="1:20">1:20</el-option>
<el-option value="1:30">1:30</el-option>
<el-option value="1:60">1:60</el-option>
</el-select>
</el-form-item>
<el-form-item label="最大值" prop="maxValue">
<el-input v-model="form.maxValue" placeholder="请输入最大值" />
<el-form-item label="数据频率名称" prop="slideData">
<el-input v-model="form.slideData" placeholder="请输入数据频率名称" />
</el-form-item>
<el-form-item label="最小值" prop="minValue">
<el-input v-model="form.minValue" placeholder="请输入最小值" />
<el-form-item label="数据频率最大值" prop="slideMaxNum">
<el-input v-model="form.slideMaxNum" placeholder="请输入数据频率最大值" />
</el-form-item>
<el-form-item label="数据频率最小值" prop="slideMinNum">
<el-input v-model="form.slideMinNum" placeholder="请输入数据频率最小值" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -182,6 +186,8 @@
<script>
import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/platform/rule";
import { listStrategy} from "@/api/platform/strategy";
import {valueList} from "@/api/car/message/template";
export default {
name: "Rule",
@ -195,16 +201,36 @@ export default {
single: true,
// 非多个禁用
multiple: true,
props: { multiple: true },
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 预警规则表格数据
ruleList: [],
//车辆类型
sysTypeList :[],
//报文字段
templateValueList:[],
value:[],
//报文模版类型
templateList :[],
//报文类型Id
templateId : null,
//车辆类型Id
sysTypeId: null,
//策略信息组
strategyList : [],
//策略信息
strategy: {},
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
//弹出抽屉
drawer:false,
// 查询参数
queryParams: {
pageNum: 1,
@ -214,8 +240,9 @@ export default {
msgTypeId: null,
slideTime: null,
slideFrequency: null,
maxValue: null,
minValue: null
slideData:null,
slideMaxNum: null,
slideMinNum: null
},
// 表单参数
form: {},
@ -228,6 +255,18 @@ export default {
this.getList();
},
methods: {
clickBox(val) {
console.log('val::', val);
let values = this.value
if(values.includes(val)) {
this.value = values.filter(n => n !== val)
} else {
values.push(val)
this.value = values
}
console.log('this.value::', this.value)
},
/** 查询预警规则列表 */
getList() {
this.loading = true;
@ -251,8 +290,9 @@ export default {
msgTypeId: null,
slideTime: null,
slideFrequency: null,
maxValue: null,
minValue: null
slideData:null,
slideMaxNum: null,
slideMinNum: null
};
this.resetForm("form");
},
@ -277,7 +317,22 @@ export default {
this.reset();
this.open = true;
this.title = "添加预警规则";
this.findInformation();
},
findInformation(){
/** 策略信息 **/
listStrategy().then(res=>{
this.strategyList = res.data.rows;
})
},
getFindByTemplateValue(val){
const { msgId } = this.strategyList.find(strategy => strategy.id === val)
valueList({messageTemplateId:msgId}).then(res=>{
this.templateValueList = res.data
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@ -287,6 +342,7 @@ export default {
this.open = true;
this.title = "修改预警规则";
});
this.findInformation();
},
/** 提交按钮 */
submitForm() {

56
src/views/platform/strategy/index.vue
View File

@ -80,7 +80,7 @@
<el-table v-loading="loading" :data="strategyList" @selection-change="handleSelectionChange">
<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="carTypeId" />
<el-table-column label="车辆类型id" align="center" prop="sysTypeId" />
<el-table-column label="策略名称" align="center" prop="strategyName" />
<el-table-column label="报文模版id" align="center" prop="msgId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -114,15 +114,29 @@
<!-- 添加或修改预警策略对话框 -->
<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-item label="车辆类型id" prop="carTypeId">
<el-input v-model="form.carTypeId" placeholder="请输入车辆类型id" />
<el-form-item label="车辆类型id" prop="sysTypeId">
<el-select v-model="form.sysTypeId" placeholder="请选择报文模版id" @change="leaveSysType(form.sysTypeId)">
<el-option
v-for="item in sysTypeList"
:key="item.sysTypeId"
:label="item.sysTypeName"
:value="item.sysTypeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="报文模版id" prop="msgId">
<el-select v-model="form.msgId" placeholder="请选择报文模版id">
<el-option
v-for="item in templateList"
:key="item.messageTemplateId"
:label="item.messageTemplateName"
:value="item.messageTemplateId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="策略名称" prop="strategyName">
<el-input v-model="form.strategyName" placeholder="请输入策略名称" />
</el-form-item>
<el-form-item label="报文模版id" prop="msgId">
<el-input v-model="form.msgId" placeholder="请输入报文模版id" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -134,6 +148,8 @@
<script>
import { listStrategy, getStrategy, delStrategy, addStrategy, updateStrategy } from "/src/api/platform/strategy";
import {getSysType} from "@/api/car/car";
import {templateList} from "@/api/car/message/template";
export default {
name: "Strategy",
@ -161,21 +177,28 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
carTypeId: null,
sysTypeId: null,
strategyName: null,
msgId: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {},
//报文类型
templateList :[],
//车辆类型
sysTypeList : []
};
},
created() {
this.getList();
},
methods: {
/** 根据选中的车辆类型选择报文信息 **/
leaveSysType(sysTypeId){
this.templateList.messageTemplateId =sysTypeId;
},
/** 查询预警策略列表 */
getList() {
this.loading = true;
@ -194,7 +217,7 @@ export default {
reset() {
this.form = {
id: null,
carTypeId: null,
sysTypeId: null,
strategyName: null,
msgId: null
};
@ -221,6 +244,18 @@ export default {
this.reset();
this.open = true;
this.title = "添加预警策略";
this.findInformation();
},
findInformation(){
/** 获取车辆类型 **/
getSysType().then(res=>{
this.sysTypeList = res.data.rows;
});
/** 获取报文类型模版 **/
templateList().then(res=>{
this.templateList = res.data;
})
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -231,6 +266,7 @@ export default {
this.open = true;
this.title = "修改预警策略";
});
this.findInformation();
},
/** 提交按钮 */
submitForm() {