monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit c026062810e10f384bebc7a0e066de319ff077af 1 parent bebe7ea2

1424 B4，及时消息的展示优化：主要是列宽[优化展示、列表加载慢]

Inline Side-by-side
Showing 2 changed files with 33 additions and 37 deletions
@@ -253,33 +253,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -253,33 +253,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
253 // 发送状态 1已发送，2未发送 253 // 发送状态 1已发送，2未发送
254 noticeTimely.sendState = 2;//statusChange(document.querySelector("#switch_noticeTimely_sendState").checked ? 0 : 1); 254 noticeTimely.sendState = 2;//statusChange(document.querySelector("#switch_noticeTimely_sendState").checked ? 0 : 1);
255 noticeTimely.noticeNames = userNames; 255 noticeTimely.noticeNames = userNames;
256 - var noticeStateList = [];  
257 - //获取消息状态列表  
258 - $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {  
259 - var noticeState = {};  
260 - noticeState.noticeName = $(this).find('input[name="noticeName"]').val();  
261 - noticeState.sendTime = $(this).find('input[name="sendTime"]').val();  
262 - noticeState.sendContent = $(this).find('input[name="sendContent"]').val();  
263 - noticeState.noticeState = $(this).find('select[name="noticeState"]').val();  
264 - noticeStateList.push(noticeState);  
265 - });  
266 - noticeTimely.noticeStateList = noticeStateList; 256 + // var noticeStateList = [];
  257 + // //获取消息状态列表
  258 + // $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {
  259 + // var noticeState = {};
  260 + // noticeState.noticeName = $(this).find('input[name="noticeName"]').val();
  261 + // noticeState.sendTime = $(this).find('input[name="sendTime"]').val();
  262 + // noticeState.sendContent = $(this).find('input[name="sendContent"]').val();
  263 + // noticeState.noticeState = $(this).find('select[name="noticeState"]').val();
  264 + // noticeStateList.push(noticeState);
  265 + // });
  266 + // noticeTimely.noticeStateList = noticeStateList;
267 if (!noticeTimely.noticeNames) { 267 if (!noticeTimely.noticeNames) {
268 layer.msg('请选择用户', {icon: 7, time: 3000}); 268 layer.msg('请选择用户', {icon: 7, time: 3000});
269 return false; 269 return false;
270 } 270 }
271 - if (!noticeTimely.templates) {  
272 - layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});  
273 - return false;  
274 - } 271 +
275 noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val(); 272 noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val();
276 //获取配置参数 273 //获取配置参数
277 var map = getParam(); 274 var map = getParam();
278 if(!map){ 275 if(!map){
279 - return ; 276 + return false;
280 } 277 }
  278 + if(map.msgSetting && map.msgSetting != '' && map.msgSetting != null){
281 noticeTimely.msgSetting = JSON.stringify(map.msgSetting); 279 noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
  280 + }
282 noticeTimely.templates = map.templates; 281 noticeTimely.templates = map.templates;
  282 + if (!noticeTimely.templates || map.msgSetting == '' || map.msgSetting == null) {
  283 + layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
  284 + return false;
  285 + }
283 layer.load(2); 286 layer.load(2);
284 admin.req({ 287 admin.req({
285 url: domainName + '/api-web/noticeTimely/save?access_token=' + accessToken, 288 url: domainName + '/api-web/noticeTimely/save?access_token=' + accessToken,
@@ -449,8 +452,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -449,8 +452,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
449 $('#details_tags').append(details_tags); 452 $('#details_tags').append(details_tags);
450 $('#details_tags span').on('click',function (){ 453 $('#details_tags span').on('click',function (){
451 $('[name="templates"]').val($('[name="templates"]').val() + '#{'+$(this).text() + '}'); 454 $('[name="templates"]').val($('[name="templates"]').val() + '#{'+$(this).text() + '}');
452 - noticeTimely.templates += '#{'+$(this).text() + '}';  
453 -  
454 }); 455 });
455 } 456 }
456 457
@@ -459,8 +460,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -459,8 +460,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
459 460
460 //获取模板和等级 461 //获取模板和等级
461 var obj = { 462 var obj = {
462 - msgSetting: null,  
463 - templates: null 463 + msgSetting: '',
  464 + templates: ''
464 }; 465 };
465 466
466 var errMsg = ''; 467 var errMsg = '';
@@ -186,41 +186,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -186,41 +186,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
186 cols: [[{ 186 cols: [[{
187 type: 'checkbox' 187 type: 'checkbox'
188 }, { 188 }, {
189 - field: 'name', title: '名称', align: 'center', width: '250', 189 + field: 'name', title: '名称', align: 'center', width: '15%',
190 templet: 190 templet:
191 '<div>' + 191 '<div>' +
192 ' <span data-id="{{d.id}}" class="link link-noticeTimely-edit">{{d.name}}</span>' + 192 ' <span data-id="{{d.id}}" class="link link-noticeTimely-edit">{{d.name}}</span>' +
193 '</div>' 193 '</div>'
194 }, { 194 }, {
195 - field: 'details', title: '内容', align: 'left', minWidth: '650', 195 + field: 'details', title: '内容', align: 'left', width: '25%',
196 templet: function (d) { 196 templet: function (d) {
197 // return '<input type="text" class="layui-input" style= "background-color:transparent;border:0;padding-bottom: 10px" readonly="readonly" name="details" value="' + d.details + '">' 197 // return '<input type="text" class="layui-input" style= "background-color:transparent;border:0;padding-bottom: 10px" readonly="readonly" name="details" value="' + d.details + '">'
198 return '<code>' + d.details + '</code>' 198 return '<code>' + d.details + '</code>'
199 } 199 }
200 }, { 200 }, {
201 - field: 'frequency', title: '频率', align: 'center', width: '130' 201 + field: 'frequency', title: '频率', align: 'center', minWidth: '130'
202 }, { 202 }, {
203 field: 'noticeNicknames', title: '用户', align: 'center', minWidth: '180' 203 field: 'noticeNicknames', title: '用户', align: 'center', minWidth: '180'
204 }, { 204 }, {
205 - field: 'state', title: '是否启用', align: 'center', width: '100', 205 + field: 'lastSendTime', title: '最后发送时间', align: 'center', minWidth: '170',templet: function (d) {
  206 + if(d.noticeStateNew && d.noticeStateNew.sendTime){
  207 + return d.noticeStateNew.sendTime;
  208 + }
  209 + return '';
  210 + }
  211 + },{
  212 + field: 'state', title: '是否启用', align: 'center', minWidth: '100',
206 templet: function (d) { 213 templet: function (d) {
207 var checked = d.state == 2 ? 'checked' : ''; 214 var checked = d.state == 2 ? 'checked' : '';
208 return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_state" name="state" lay-skin="switch" lay-text="启用|禁用" ' + checked + ' ></div>' 215 return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_state" name="state" lay-skin="switch" lay-text="启用|禁用" ' + checked + ' ></div>'
209 } 216 }
210 - }, /*{  
211 - field: 'broadcast', title: '是否广播', align: 'center', width: '100',  
212 - templet: function (d) {  
213 - var checked = d.broadcast == 1 ? 'checked' : '';  
214 - return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_broadcast" name="broadcast" lay-skin="switch" lay-text="是|否" ' + checked + ' ></div>'  
215 - }  
216 }, { 217 }, {
217 - field: 'retry', title: '是否轮循', align: 'center', width: '100',  
218 - templet: function (d) {  
219 - var checked = d.retry == 1 ? 'checked' : '';  
220 - return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_retry" name="retry" lay-skin="switch" lay-text="重发|不重发" ' + checked + ' ></div>'  
221 - }  
222 - }, */{  
223 - title: '操作', align: 'center', minWidth: '150', fixed: 'right', 218 + title: '操作', align: 'center', minWidth: '120', fixed: 'right',
224 templet: 219 templet:
225 '<div>' + 220 '<div>' +
226 ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' + 221 ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +