monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit d4f79c6b40b150f607a7b3cecaa3d0a52cd9542a 1 parent 2a39a41b

1443 B1，通知查询功能优化

Inline Side-by-side
Showing 3 changed files with 38 additions and 26 deletions
... ... @@ -96,6 +96,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
conditions.startTime = $('#condition-template-startTime').val().trim();
conditions.endTime = $('#condition-template-endTime').val().trim();
noticeTable = table.render({
id:'systemNoticeNoticeTable',
elem: '#notice-table',
url: domainName + '/api-web/manage/noticetemp/page?access_token=' + accessToken,
where: conditions,
... ... @@ -142,19 +143,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
// }
// }
, {
field: 'subPersonSum', title: '订阅人数', align: 'center', sort: true,
field: 'subPersonSum', title: '订阅用户', align: 'center',
templet: function (d) {
if (!d.noticeTempUserList) {
return '';
} else {
var userList = [];
var userName = ''
$.each(d.noticeTempUserList,function (i,v) {
userList.push(v.nickname);
})
userName = userList.toString();
// return '<span data-subid="' + d.subId + '" class="layui-table-link link-notice-temp-view-user" style="width: 100%;">' + userName + '</span>';
return '<span>' + userName + '</span>';
return userList.join(",");
}
}
}, /*{
... ... @@ -166,9 +165,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
}
}
},*/ {
field: 'frequency', title: '通知频率', align: 'center'
field: 'frequency', title: '通知频率', align: 'center',sort:true
}, {
field: 'tempStatus', title: '状态', align: 'center',
field: 'tempStatus', title: '状态', align: 'center',sort: true,
templet: function (d) {
var checked = '';
if(d.enable == '1'){ //默认
... ... @@ -410,6 +409,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
// });
}
});
//触发排序事件
table.on('sort(notice-table)', function(obj){
var type = !obj.type ? 'desc' : obj.type;
conditions.orderKey = ` ${obj.field} ${type}`
//尽管我们的 table 自带排序功能，但并没有请求服务端。
//有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
table.reload('systemNoticeNoticeTable', {
initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
,where: conditions
});
//layer.msg('服务端排序。order by '+ obj.field + ' ' + obj.type);
});
}
//发送通知弹窗
... ...
... ... @@ -68,30 +68,23 @@
</div>
</div>
<div class="layui-inline">
<!-- <button id="noticeSearchQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-primary" data-period="all">全部</button>
<button type="button" class="layui-btn active" data-period="today">今天</button>
<button type="button" class="layui-btn layui-btn-primary" data-period="week">本周</button>
<button type="button" class="layui-btn layui-btn-primary" data-period="month">本月</button>
<button type="button" class="layui-btn layui-btn-primary" data-period="custom" id="dataPeriodCustom">自定义</button>
</div>
</div>
<div class="layui-inline">
<button id="noticeSearchQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i
class="layui-icon layui-icon-search"></i>查询
</button>-->
</button>
</div>
</div>
</form>
</div>
<div class="search_button_group">
<div class="quick_search" id="quick_search">
<span>ip</span>
<span>ip1</span>
</div>
<div class="layui-card-header card_header_search_button" >
<div class="layui-btn-group time-group" id="noticeCount_time_button_id" style="float: right;">
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="all">全部</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" data-period="today">今天</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="week">本周</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="month">本月</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="custom">自定义</button>
</div>
</div>
</div>
</div>
<div style="display: flex" class="layui-card-echart">
<div style="flex-grow: 3;width: 66%!important;" >
... ...
... ... @@ -383,6 +383,7 @@
,trigger: 'focus' //呼出控件的事件
,show: false //是否直接显示，如果设置true，则默认直接显示控件
,showBottom: true //是否显示底部栏
,isPreview: true //是否显示值预览
,btns: ['clear', 'now', 'confirm'] //右下角显示的按钮，会按照数组顺序排列
,lang: 'cn' //语言，只支持cn/en，即中文和英文
,theme: 'default' //主题
... ... @@ -843,7 +844,7 @@
,elem = that.bindElem || options.elem[0]
,valType = that.isInput(elem) ? 'val' : 'html'
,value = that.isInput(elem) ? elem.value : (options.position === 'static' ? '' : elem.innerHTML)
,value = that.isInput(elem) ? elem.value : (options.position === 'static' ? '' : '')
//校验日期有效数字
,checkValid = function(dateTime){
... ... @@ -1411,6 +1412,9 @@
,elem = that.bindElem || options.elem[0]
,valType = that.isInput(elem) ? 'val' : 'html'
if(!options.isPreview){
return this;
}
options.position === 'static' || lay(elem)[valType](value || '');
return this;
};
... ... @@ -1867,4 +1871,4 @@
}()
);
}();
\ No newline at end of file
}();
... ...