This commit is contained in:
ly19960718 2021-10-14 10:55:29 +08:00
parent 92d518640f
commit 64dfaafdcd
7 changed files with 185 additions and 22 deletions

View File

@ -248,6 +248,8 @@
<if test="keywords != null and keywords != ''">
AND (
t1.event_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.event_site LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">
@ -258,12 +260,11 @@
AND
LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
</if>
<if test="importantEventIds != null and importantEventIds.size > 0">
AND
t1.important_event_id IN
<foreach collection="importantEventIds" index="index" open="(" separator="," close=")">
#{importantEventIds[${index}]}
</foreach>
<if test="eventLevelId != null and eventLevelId != ''">
AND t1.event_level_id = #{eventLevelId}
</if>
<if test="eventTypeId != null and eventTypeId != ''">
AND t1.event_type_id = #{eventTypeId}
</if>
ORDER BY t1.gmt_create DESC
</select>

View File

@ -254,12 +254,14 @@
AND
LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
</if>
<if test="lrsIds != null and lrsIds.size > 0">
AND
t1.lrs_id IN
<foreach collection="lrsIds" index="index" open="(" separator="," close=")">
#{lrsIds[${index}]}
</foreach>
<if test="lrsAreaLevelId != null and lrsAreaLevelId != ''">
AND t1.lrs_area_level_id = #{lrsAreaLevelId}
</if>
<if test="lrsSubjectLevelId != null and lrsSubjectLevelId != ''">
AND t1.lrs_subject_level_id = #{lrsSubjectLevelId}
</if>
<if test="lrsPolicyTypeId != null and lrsPolicyTypeId != ''">
AND t1.lrs_policy_type_id = #{lrsPolicyTypeId}
</if>
ORDER BY t1.gmt_create DESC
</select>

View File

@ -9,6 +9,12 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.search-item .layui-form-select .layui-input{
width: 150px!important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -18,7 +24,7 @@
<div class="layui-card-body">
<div class="test-table-reload-btn" style="margin-bottom: 10px;">
<div class="layui-inline">
<input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
<input type="text" id="keywords" class="layui-input search-item" placeholder="输入事件名称、发生地">
</div>
<div class="layui-inline">
<input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
@ -26,6 +32,28 @@
<div class="layui-inline">
<input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
</div>
<div class="layui-inline layui-form search-item" id="eventLevelIdSelectTemplateBox" lay-filter="eventLevelIdSelectTemplateBox"></div>
<script id="eventLevelIdSelectTemplate" type="text/html">
<select id="eventLevelId" name="eventLevelId" lay-verify="required">
<option value="">请选择事件分级</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dataId}}">{{item.dataName}}</option>
{{# } }}
</select>
</script>
<div class="layui-inline layui-form search-item" id="eventTypeIdSelectTemplateBox" lay-filter="eventTypeIdSelectTemplateBox"></div>
<script id="eventTypeIdSelectTemplate" type="text/html">
<select id="eventTypeId" name="eventTypeId" lay-verify="required">
<option value="">请选择事件类型</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dataId}}">{{item.dataName}}</option>
{{# } }}
</select>
</script>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -57,12 +85,14 @@
base: 'assets/layuiadmin/'
}).extend({
index: 'lib/index'
}).use(['index', 'table', 'laydate', 'common'], function() {
}).use(['index', 'table', 'laydate', 'common','form','laytpl'], function() {
var $ = layui.$;
var $win = $(window);
var table = layui.table;
var admin = layui.admin;
var laydate = layui.laydate;
var form = layui.form;
var laytpl = layui.laytpl;
var common = layui.common;
var resizeTimeout = null;
var tableUrl = 'api/importantevent/listpage';
@ -169,7 +199,9 @@
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
eventLevelId: $('#eventLevelId').val(),
eventTypeId: $('#eventTypeId').val()
},
page: {
curr: currentPage
@ -211,6 +243,38 @@
}
});
}
// 初始化事件分级ID选择
function initEventLevelIdSelect() {
top.restAjax.get(top.restAjax.path('api/data/listbyparentid/{dataParentId}', ['77b5f275-342b-403b-a737-759357fcae55']), {}, null, function(code, data, args) {
laytpl(document.getElementById('eventLevelIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('eventLevelIdSelectTemplateBox').innerHTML = html;
});
form.render('select', 'eventLevelIdSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化事件类型ID选择
function initEventTypeIdSelect() {
top.restAjax.get(top.restAjax.path('api/data/listbyparentid/{dataParentId}', ['0cd4e948-db42-4745-9073-4e8232aa4b02']), {}, null, function(code, data, args) {
laytpl(document.getElementById('eventTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('eventTypeIdSelectTemplateBox').innerHTML = html;
});
form.render('select', 'eventTypeIdSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化内容
function initData() {
initEventLevelIdSelect();
initEventTypeIdSelect();
}
initData();
initTable();
initDate();
// 事件 - 页面变化

View File

@ -9,6 +9,11 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.search-item .layui-form-select .layui-input{
width: 150px!important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -46,9 +51,6 @@
{{# } }}
</select>
</script>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>

View File

@ -9,6 +9,12 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.search-item .layui-form-select .layui-input{
width: 200px!important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -18,7 +24,7 @@
<div class="layui-card-body">
<div class="test-table-reload-btn" style="margin-bottom: 10px;">
<div class="layui-inline">
<input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
<input style="width: 300px" type="text" id="keywords" class="layui-input search-item" placeholder="输入被实施地区、实施主体名称">
</div>
<div class="layui-inline">
<input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
@ -26,6 +32,38 @@
<div class="layui-inline">
<input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
</div>
<div class="layui-inline layui-form search-item" id="lrsAreaLevelIdSelectTemplateBox"
lay-filter="lrsAreaLevelIdSelectTemplateBox"></div>
<script id="lrsAreaLevelIdSelectTemplate" type="text/html">
<select id="lrsAreaLevelId" name="lrsAreaLevelId" lay-verify="required">
<option value="">请选择被实施地区层级</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dataId}}">{{item.dataName}}</option>
{{# } }}
</select>
</script>
<div class="layui-inline layui-form search-item" id="lrsSubjectLevelIdSelectTemplateBox" lay-filter="lrsSubjectLevelIdSelectTemplateBox"></div>
<script id="lrsSubjectLevelIdSelectTemplate" type="text/html">
<select id="lrsSubjectLevelId" name="lrsSubjectLevelId" lay-verify="required">
<option value="">请选择实施主体等级</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dataId}}">{{item.dataName}}</option>
{{# } }}
</select>
</script>
<div class="layui-inline layui-form search-item" id="lrsPolicyTypeIdSelectTemplateBox" lay-filter="lrsPolicyTypeIdSelectTemplateBox"></div>
<script id="lrsPolicyTypeIdSelectTemplate" type="text/html">
<select id="lrsPolicyTypeId" name="lrsPolicyTypeId" lay-verify="required">
<option value="">请选择政策种类</option>
{{# for(var i = 0, item; item = d[i++];) { }}
<option value="{{item.dataId}}">{{item.dataName}}</option>
{{# } }}
</select>
</script>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -57,12 +95,14 @@
base: 'assets/layuiadmin/'
}).extend({
index: 'lib/index'
}).use(['index', 'table', 'laydate', 'common'], function() {
}).use(['index', 'table', 'laydate', 'common','form','laytpl'], function() {
var $ = layui.$;
var $win = $(window);
var table = layui.table;
var admin = layui.admin;
var laydate = layui.laydate;
var form = layui.form;
var laytpl = layui.laytpl;
var common = layui.common;
var resizeTimeout = null;
var tableUrl = 'api/lrs/listpage';
@ -160,7 +200,10 @@
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
lrsAreaLevelId:$('#lrsAreaLevelId').val(),
lrsSubjectLevelId:$('#lrsSubjectLevelId').val(),
lrsPolicyTypeId:$('#lrsPolicyTypeId').val()
},
page: {
curr: currentPage
@ -202,8 +245,51 @@
}
});
}
// 初始化被实施地区层级ID下拉选择
function initLrsAreaLevelIdSelect() {
top.restAjax.get(top.restAjax.path('api/data/listbyparentid/{dataParentId}', ['adfc5f04-67ce-4d91-a408-1473f75703eb']), {}, null, function(code, data, args) {
laytpl(document.getElementById('lrsAreaLevelIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('lrsAreaLevelIdSelectTemplateBox').innerHTML = html;
});
form.render('select', 'lrsAreaLevelIdSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化实施主体等级ID下拉选择
function initLrsSubjectLevelIdSelect() {
top.restAjax.get(top.restAjax.path('api/data/listbyparentid/{dataParentId}', ['adfc5f04-67ce-4d91-a408-1473f75703eb']), {}, null, function(code, data, args) {
laytpl(document.getElementById('lrsSubjectLevelIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('lrsSubjectLevelIdSelectTemplateBox').innerHTML = html;
});
form.render('select', 'lrsSubjectLevelIdSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
// 初始化政策种类ID下拉选择
function initLrsPolicyTypeIdSelect() {
top.restAjax.get(top.restAjax.path('api/data/listbyparentid/{dataParentId}', ['25ad1e91-cc50-4615-a24d-a2387fa6de27']), {}, null, function(code, data, args) {
laytpl(document.getElementById('lrsPolicyTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('lrsPolicyTypeIdSelectTemplateBox').innerHTML = html;
});
form.render('select', 'lrsPolicyTypeIdSelectTemplateBox');
}, function(code, data) {
top.dialog.msg(data.msg);
});
}
function ininData(){
initLrsAreaLevelIdSelect();
initLrsSubjectLevelIdSelect();
initLrsPolicyTypeIdSelect();
}
initTable();
initDate();
ininData();
// 事件 - 页面变化
$win.on('resize', function() {
clearTimeout(resizeTimeout);

View File

@ -10,6 +10,14 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.layui-form-label{
width: 200px !important;
}
.layui-input-block{
margin-left:200px !important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">

View File

@ -298,7 +298,7 @@
title: false,
closeBtn: 0,
area: ['70%', '70%'],
shadeClose: true,
shadeClose: false,
anim: 2,
content: top.restAjax.path('route/teamuser/search', []),
end: function(index) {