1443 B1，通知查询功能优化

wangtao
Commit 656d6d290342b35337a9c1e770203b9a4c4dc524 1 parent f6afbed5
Showing 1 changed file with 57 additions and 21 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/noticeIndex.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/noticeIndex.js
View file @656d6d2
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/noticeIndex.js
View file @656d6d2
 //通知查询
-layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect', 'echarts'], function (exports) {
+layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect', 'echarts','laydate'], function (exports) {
     var $ = layui.$;
     var form = layui.form;
     var layer = layui.layer;
@@ -9,6 +9,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
     var domainName = common.domainName;
     var xmSelect = layui.xmSelect;
     var echarts = layui.echarts;
+    var laydate = layui.laydate;
     //对外暴露的接口
     exports('noticeIndex', function (data) {
@@ -44,6 +45,44 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
         $('#queryMore').on('click',function(){
             queryData();
         });
+
+        $('button[data-period]').on('click',function(){
+            var that = $(this);
+            that.addClass('active');
+            that.removeClass('layui-btn-primary');
+            var currentVal = that.attr('data-period');
+            $.each($('button[data-period]'), function(index , el){
+                var itemEl = $(el);
+                var val = itemEl.attr('data-period');
+                if(currentVal != val){
+                    itemEl.addClass('layui-btn-primary');
+                    itemEl.removeClass('active');
+                }
+            });
+
+            // yyyy-MM-dd HH:mm:ss - yyyy-MM-dd HH:mm:ss
+            if(currentVal == 'custom'){
+                laydate.render({
+                    elem: '#dataPeriodCustom', //指定元素
+                    range: true,
+                    type: 'datetime',
+                    isInitValue: false,
+                    isPreview: false,
+                    value : new Date(),
+                    format:'yyyy-MM-dd HH:mm:ss',
+                    show: true, //直接显示
+                    done: function(value, date, endDate){
+                        that.attr('data-val',value);
+                        reloadData();
+                    }
+                });
+                return;
+            }
+            reloadData();
+        });
+
+
+
         form.render();
         getChartData();
@@ -59,7 +98,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                 usernames:userNames,
                 isSend: $('#notice_search_isSend').val(),
                 alarmKpi: $("#noticeAlarmKpiSearchBox").val(),
-                way:$('#noticeWaySearchBox').val()
+                way:$('#noticeWaySearchBox').val(),
+                dataPeriod: $('button[data-period].active').attr('data-period'),
+                timeRange: $('button[data-period].active').attr('data-val')
             }
             , height: 'full-380'
             , page: {
@@ -317,24 +358,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                 form.render();
             }
         })
-        //lsq 快速检查字典数据 2022-07-05
-        $.ajax({
-            url: domainName + '/api-web/manage/ddic/findSucDdics/quick_search?access_token='+accessToken,
-            type: "POST",
-            success:function (res) {
-                var quickSearchs = res.data;
-                var html = ''
-                $.each(quickSearchs,function (i,e) {
-                    html+=' <span data-code="'+e.ddicCode+'">'+e.ddicName+'</span>'
-                })
-                $("#quick_search").html('');
-                $("#quick_search").append(html);
-                form.render();
-            }
-        })
+
         //刷新表格
         function reloadTable() {
             noticeTable.reload({
+                page: {
+                    curr: 1
+                },
                 where:{
                     access_token:accessToken,
                     keyword: $('#notice_search_keyword').val(),
@@ -344,7 +374,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                     usernames:userNames,
                     page: 1,
                     alarmKpi: $("#noticeAlarmKpiSearchBox").val(),
-                    way:$('#noticeWaySearchBox').val()
+                    way:$('#noticeWaySearchBox').val(),
+                    dataPeriod: $('button[data-period].active').attr('data-period'),
+                    timeRange: $('button[data-period].active').attr('data-val')
                 }
             });
         }
@@ -580,7 +612,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                 resType: resType,
                 isSend: $('#notice_search_isSend').val(),
                 alarmKpi: $("#noticeAlarmKpiSearchBox").val(),
-                way:$('#noticeWaySearchBox').val()
+                way:$('#noticeWaySearchBox').val(),
+                dataPeriod: $('button[data-period].active').attr('data-period'),
+                timeRange: $('button[data-period].active').attr('data-val')
             };
             $.ajax({
@@ -609,7 +643,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                         var yData = res.map.countList;
                         var xData = res.map.userList;
                         //展示前20条数据 @Editor LH
-                        loadNoticeChart(noticeUserChart,xData.slice(0, 20), yData.slice(0, 20));
+                        loadNoticeChart(noticeUserChart,xData.slice(0, 15), yData.slice(0, 15));
                     }
                 }
             })
@@ -636,7 +670,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                         resType: resType,
                         isSend: $('#notice_search_isSend').val(),
                         alarmKpi: $("#noticeAlarmKpiSearchBox").val(),
-                        way:$('#noticeWaySearchBox').val()
+                        way:$('#noticeWaySearchBox').val(),
+                        dataPeriod: $('button[data-period].active').attr('data-period'),
+                        timeRange: $('button[data-period].active').attr('data-val')
                     };
                     var noticeTypeChartNew = echarts.init(document.getElementById('notice_chart_type_new'));
                     $.ajax({