Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

优化告警页面

Browse Source
This commit is contained in:
weidong 2023-11-22 11:24:28 +08:00
parent 0b4b3fb477
commit c1fc562c3b
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java
View File

@ -80,6 +80,16 @@ public class WarningController extends BasicController {
if (!StringUtils.isEmpty(deviceid)) {
queryWrapper.like("deviceid", deviceid);
}
//设备类型
String devicetype = search.getString("devicetype");
if (!StringUtils.isEmpty(devicetype)) {
queryWrapper.eq("devicetype", devicetype);
}
//告警级别
String level = search.getString("level");
if (!StringUtils.isEmpty(level)) {
queryWrapper.eq("level", level);
}
//时间范围
String q_start = search.getString("q_start");
if (!StringUtils.isEmpty(q_start)) {

22
sec-beidou/src/main/resources/templates/page/warning.html
View File

@ -9,13 +9,13 @@
<div class="layui-inline">
<label class="layui-form-label">设备号</label>
<div class="layui-input-inline">
<input type="text" name="username" autocomplete="off" class="layui-input">
<input type="text" name="deviceid" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">设备类型</label>
<div class="layui-input-inline">
<select name="device_type" lay-verify="required" lay-search="">
<select name="devicetype" lay-search="">
<option value="">选择或搜索</option>
<option value="1">北斗</option>
<option value="2">测斜</option>
@ -26,13 +26,22 @@
<div class="layui-inline">
<label class="layui-form-label">告警级别</label>
<div class="layui-input-inline">
<select name="level" lay-verify="required" lay-search="">
<select name="level" lay-search="">
<option value="">选择或搜索</option>
<option value="1">一般</option>
<option value="2">严重</option>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">范围</label>
<div class="layui-input-inline">
<input type="text" name="q_start" autocomplete="off" id="ID-laydate-start-date" class="layui-input" placeholder="开始日期">
</div>
<div class="layui-input-inline">
<input type="text" name="q_end" autocomplete="off" id="ID-laydate-end-date" class="layui-input" placeholder="结束日期">
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
</div>
@ -66,12 +75,12 @@
icon: 'layui-icon-tips'
}],
cols: [[
{field: 'createtime', title: '上报时间', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
{field: 'createtime', title: '上报时间', width: '15%', templet: "<div>{{layui.util.toDateString(d.createtime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
{field: 'deviceid', title: '设备号'},
{field: 'devicetype', title: '设备类型'},
{field: 'level', title: '告警级别'},
{field: 'code', title: '告警类型'},
{field: 'info', title: '告警内容', minWidth: 150}
{field: 'info', title: '告警内容', width: '35%'}
]],
limits: [10, 15, 20, 25, 50, 100],
limit: 15,
@ -82,9 +91,6 @@
// 监听搜索操作
form.on('submit(data-search-btn)', function (data) {
var result = JSON.stringify(data.field);
layer.alert(result, {
title: '最终的搜索信息'
});
//执行搜索重载
table.reload('currentTableId', {