diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyAdd.js
index ce1a939..38a3522 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyAdd.js
@@ -253,33 +253,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
// 发送状态 1已发送，2未发送
noticeTimely.sendState = 2;//statusChange(document.querySelector("#switch_noticeTimely_sendState").checked ? 0 : 1);
noticeTimely.noticeNames = userNames;
- var noticeStateList = [];
- //获取消息状态列表
- $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {
- var noticeState = {};
- noticeState.noticeName = $(this).find('input[name="noticeName"]').val();
- noticeState.sendTime = $(this).find('input[name="sendTime"]').val();
- noticeState.sendContent = $(this).find('input[name="sendContent"]').val();
- noticeState.noticeState = $(this).find('select[name="noticeState"]').val();
- noticeStateList.push(noticeState);
- });
- noticeTimely.noticeStateList = noticeStateList;
+ // var noticeStateList = [];
+ // //获取消息状态列表
+ // $.each($('#editNoticeTimely_add_table').find('tbody tr'), function (i, v) {
+ // var noticeState = {};
+ // noticeState.noticeName = $(this).find('input[name="noticeName"]').val();
+ // noticeState.sendTime = $(this).find('input[name="sendTime"]').val();
+ // noticeState.sendContent = $(this).find('input[name="sendContent"]').val();
+ // noticeState.noticeState = $(this).find('select[name="noticeState"]').val();
+ // noticeStateList.push(noticeState);
+ // });
+ // noticeTimely.noticeStateList = noticeStateList;
if (!noticeTimely.noticeNames) {
layer.msg('请选择用户', {icon: 7, time: 3000});
return false;
}
- if (!noticeTimely.templates) {
- layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
- return false;
- }
+
noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val();
//获取配置参数
var map = getParam();
if(!map){
- return ;
+ return false;
+ }
+ if(map.msgSetting && map.msgSetting != '' && map.msgSetting != null){
+ noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
}
- noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
noticeTimely.templates = map.templates;
+ if (!noticeTimely.templates || map.msgSetting == '' || map.msgSetting == null) {
+ layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
+ return false;
+ }
layer.load(2);
admin.req({
url: domainName + '/api-web/noticeTimely/save?access_token=' + accessToken,
@@ -449,8 +452,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
$('#details_tags').append(details_tags);
$('#details_tags span').on('click',function (){
$('[name="templates"]').val($('[name="templates"]').val() + '#{'+$(this).text() + '}');
- noticeTimely.templates += '#{'+$(this).text() + '}';
-
});
}
@@ -459,8 +460,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
//获取模板和等级
var obj = {
- msgSetting: null,
- templates: null
+ msgSetting: '',
+ templates: ''
};
var errMsg = '';
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyIndex.js
index bcf929d..8d3cffa 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyIndex.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/noticeTimelyIndex.js
@@ -186,46 +186,41 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
cols: [[{
type: 'checkbox'
}, {
- field: 'name', title: '名称', align: 'center', width: '250',
+ field: 'name', title: '名称', align: 'center', width: '15%',
templet:
'<div>' +
' <span data-id="{{d.id}}" class="link link-noticeTimely-edit">{{d.name}}</span>' +
'</div>'
}, {
- field: 'details', title: '内容', align: 'left', minWidth: '650',
+ field: 'details', title: '内容', align: 'left', width: '25%',
templet: function (d) {
// return '<input type="text" class="layui-input" style= "background-color:transparent;border:0;padding-bottom: 10px" readonly="readonly" name="details" value="' + d.details + '">'
return '<code>' + d.details + '</code>'
}
}, {
- field: 'frequency', title: '频率', align: 'center', width: '130'
+ field: 'frequency', title: '频率', align: 'center', minWidth: '130'
}, {
field: 'noticeNicknames', title: '用户', align: 'center', minWidth: '180'
}, {
- field: 'state', title: '是否启用', align: 'center', width: '100',
+ field: 'lastSendTime', title: '最后发送时间', align: 'center', minWidth: '170',templet: function (d) {
+ if(d.noticeStateNew && d.noticeStateNew.sendTime){
+ return d.noticeStateNew.sendTime;
+ }
+ return '';
+ }
+ },{
+ field: 'state', title: '是否启用', align: 'center', minWidth: '100',
templet: function (d) {
var checked = d.state == 2 ? 'checked' : '';
return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_state" name="state" lay-skin="switch" lay-text="启用|禁用" ' + checked + ' ></div>'
}
- }, /*{
- field: 'broadcast', title: '是否广播', align: 'center', width: '100',
- templet: function (d) {
- var checked = d.broadcast == 1 ? 'checked' : '';
- return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_broadcast" name="broadcast" lay-skin="switch" lay-text="是|否" ' + checked + ' ></div>'
- }
}, {
- field: 'retry', title: '是否轮循', align: 'center', width: '100',
- templet: function (d) {
- var checked = d.retry == 1 ? 'checked' : '';
- return '<div><input type="checkbox" data-id="' + d.id + '" lay-filter="switch_noticeTimely_checkbox_retry" name="retry" lay-skin="switch" lay-text="重发|不重发" ' + checked + ' ></div>'
- }
- }, */{
- title: '操作', align: 'center', minWidth: '150', fixed: 'right',
- templet:
- '<div>' +
- ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon"></i></button>' +
- ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-history" lay-tips="历史记录"><i class="layui-icon"></i></button>' +
- '</div>'
+ title: '操作', align: 'center', minWidth: '120', fixed: 'right',
+ templet:
+ '<div>' +
+ ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-delete" lay-tips="删除"><i class="layui-icon"></i></button>' +
+ ' <button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-noticeTimely-history" lay-tips="历史记录"><i class="layui-icon"></i></button>' +
+ '</div>'
}]],
done: function (res) {
// 点击名称编辑事件