monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 06761712d49a1d0b92b6eaf5459a744d434b2a84 2 parents e86a4041 0517f37e

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 2 changed files with 128 additions and 107 deletions
1 //告警模板 1 //告警模板
2 -layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','view','laytpl'], function (exports) { 2 +layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions', 'view', 'laytpl'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var layer = layui.layer; 5 var layer = layui.layer;
@@ -20,7 +20,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -20,7 +20,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
20 var checkList = common.checkPermission(accessToken); 20 var checkList = common.checkPermission(accessToken);
21 21
22 22
23 -  
24 //回车搜索 23 //回车搜索
25 $('#alarmtemplatekw').keydown(function (e) { 24 $('#alarmtemplatekw').keydown(function (e) {
26 if (e.keyCode === 13) { 25 if (e.keyCode === 13) {
@@ -28,12 +27,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -28,12 +27,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
28 } 27 }
29 }); 28 });
30 29
31 - $('#alarmtemplateQueryBtn').on('click',function () { 30 + $('#alarmtemplateQueryBtn').on('click', function () {
32 reloadalarmtemplateTable(); 31 reloadalarmtemplateTable();
33 }); 32 });
34 form.render(null, 'alarmtemplate-form'); 33 form.render(null, 'alarmtemplate-form');
35 //新增 34 //新增
36 - $("#alarmtemplate_create").on("click",function () { 35 + $("#alarmtemplate_create").on("click", function () {
37 if ($.inArray('back:alarmtemp:save', checkList) == -1) { 36 if ($.inArray('back:alarmtemp:save', checkList) == -1) {
38 layer.msg('暂无权限!', {icon: 7, time: 3000}); 37 layer.msg('暂无权限!', {icon: 7, time: 3000});
39 return; 38 return;
@@ -41,11 +40,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -41,11 +40,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
41 openAlarmTemplateForm(); 40 openAlarmTemplateForm();
42 }); 41 });
43 //删除 42 //删除
44 - $("#alarmtemplate_delete").on("click",function () { 43 + $("#alarmtemplate_delete").on("click", function () {
45 deletealarmtemplate(); 44 deletealarmtemplate();
46 }); 45 });
47 //同步 46 //同步
48 - $("#alarmtemplate_sync").on("click",function () { 47 + $("#alarmtemplate_sync").on("click", function () {
49 if ($.inArray('back:alarmtemp:synchronization', checkList) == -1) { 48 if ($.inArray('back:alarmtemp:synchronization', checkList) == -1) {
50 layer.msg('暂无权限!', {icon: 7, time: 3000}); 49 layer.msg('暂无权限!', {icon: 7, time: 3000});
51 return; 50 return;
@@ -53,16 +52,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -53,16 +52,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
53 syncAlarmTemplate(); 52 syncAlarmTemplate();
54 }); 53 });
55 //配置策略 54 //配置策略
56 - $("#alarmtemplate_configpolicy").on("click",function () { 55 + $("#alarmtemplate_configpolicy").on("click", function () {
57 if ($.inArray('back:alarmtemp:tactics', checkList) == -1) { 56 if ($.inArray('back:alarmtemp:tactics', checkList) == -1) {
58 layer.msg('暂无权限!', {icon: 7, time: 3000}); 57 layer.msg('暂无权限!', {icon: 7, time: 3000});
59 return; 58 return;
60 } 59 }
61 var tempData = table.checkStatus('alarmtemplateTable').data; 60 var tempData = table.checkStatus('alarmtemplateTable').data;
62 var oldAlarmPolicyIdList = []; 61 var oldAlarmPolicyIdList = [];
63 - if (tempData.length<=1){ 62 + if (tempData.length == 1) {
64 admin.req({ 63 admin.req({
65 - url: common.domainName + '/api-web/alarmPolicy/getbytempId/'+tempData[0].alarmTempId, 64 + url: common.domainName + '/api-web/alarmPolicy/getbytempId/' + tempData[0].alarmTempId,
66 async: false, 65 async: false,
67 error: function () { 66 error: function () {
68 layer.close(loading); 67 layer.close(loading);
@@ -72,64 +71,67 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -72,64 +71,67 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
72 oldAlarmPolicyIdList = response.data.map(item => item.alarmPolicyId) 71 oldAlarmPolicyIdList = response.data.map(item => item.alarmPolicyId)
73 } 72 }
74 }); 73 });
  74 + }else{
  75 + layer.msg("请至少选择一条数据！", {offset: '15px', icon: 7, time: 1000});
  76 + return false;
75 } 77 }
76 78
77 - if(tempData && tempData.length > 0){  
78 - common.openWin("baseconfig/alarmpolicy/index","选择策略",{oldData:oldAlarmPolicyIdList},["选择","取消"], function () { 79 + if (tempData && tempData.length > 0) {
  80 + common.openWin("baseconfig/alarmpolicy/index", "选择策略", {oldData: oldAlarmPolicyIdList}, ["选择", "取消"], function () {
79 var policyData = layui.alarmpolicyIndex().getData(); 81 var policyData = layui.alarmpolicyIndex().getData();
80 - var tempIds = [],policyIds=[];  
81 - $.each(tempData,function (i,v){ 82 + var tempIds = [], policyIds = [];
  83 + $.each(tempData, function (i, v) {
82 tempIds.push(v.alarmTempId); 84 tempIds.push(v.alarmTempId);
83 }) 85 })
84 - $.each(policyData,function (i,v){ 86 + $.each(policyData, function (i, v) {
85 policyIds.push(v.alarmPolicyId); 87 policyIds.push(v.alarmPolicyId);
86 }) 88 })
87 admin.req({ 89 admin.req({
88 - url : domainName + '/api-web/alarmtemplate/config/policy'  
89 - ,type:'post'  
90 - ,data:{ tempIds:tempIds.toString(),policyIds:policyIds.toString() }  
91 - ,done:function (res){  
92 - if(res.success){  
93 - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ 90 + url: domainName + '/api-web/alarmtemplate/config/policy'
  91 + , type: 'post'
  92 + , data: {tempIds: tempIds.toString(), policyIds: policyIds.toString()}
  93 + , done: function (res) {
  94 + if (res.success) {
  95 + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
94 layer.closeAll(); 96 layer.closeAll();
95 reloadalarmtemplateTable(); 97 reloadalarmtemplateTable();
96 }); 98 });
97 - }else{  
98 - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); 99 + } else {
  100 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
99 } 101 }
100 } 102 }
101 }); 103 });
102 }); 104 });
103 - }else{  
104 - layer.msg("请至少选择一条数据！", { offset: '15px' , icon: 7 , time: 1000 }); 105 + } else {
  106 + layer.msg("请至少选择一条数据！", {offset: '15px', icon: 7, time: 1000});
105 } 107 }
106 108
107 }); 109 });
108 110
109 //配置资源 111 //配置资源
110 - $("#alarmtemplate_configres").on("click",function () { 112 + $("#alarmtemplate_configres").on("click", function () {
111 if ($.inArray('back:alarmtemp:resource', checkList) == -1) { 113 if ($.inArray('back:alarmtemp:resource', checkList) == -1) {
112 layer.msg('暂无权限!', {icon: 7, time: 3000}); 114 layer.msg('暂无权限!', {icon: 7, time: 3000});
113 return; 115 return;
114 } 116 }
115 var tempIds = []; 117 var tempIds = [];
116 var data = table.checkStatus('alarmtemplateTable').data; 118 var data = table.checkStatus('alarmtemplateTable').data;
117 - if(data && data.length > 0){  
118 - $.each(data,function (i,obj) { 119 + if (data && data.length > 0) {
  120 + $.each(data, function (i, obj) {
119 tempIds.push(obj.alarmTempId); 121 tempIds.push(obj.alarmTempId);
120 }); 122 });
121 } 123 }
122 if (tempIds.length != 1) { 124 if (tempIds.length != 1) {
123 - layer.msg('请选择一条要配置的数据',{icon: 7,time:2000}); 125 + layer.msg('请选择一条要配置的数据', {icon: 7, time: 2000});
124 return; 126 return;
125 } 127 }
126 var oldResIdList = []; 128 var oldResIdList = [];
127 - if (tempIds.length<=1){ 129 + if (tempIds.length <= 1) {
128 admin.req({ 130 admin.req({
129 url: common.domainName + '/api-web/alarmtemplate/getResIdByTempId', 131 url: common.domainName + '/api-web/alarmtemplate/getResIdByTempId',
130 async: false, 132 async: false,
131 data: { 133 data: {
132 - tempId:tempIds.toString(), 134 + tempId: tempIds.toString(),
133 }, 135 },
134 error: function () { 136 error: function () {
135 layer.close(loading); 137 layer.close(loading);
@@ -140,23 +142,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -140,23 +142,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
140 } 142 }
141 }); 143 });
142 } 144 }
143 - common.openWin("template/res/reslist","配置资源",{oldData:oldResIdList},["选择","取消"], function () { 145 + common.openWin("template/res/reslist", "配置资源", {oldData: oldResIdList}, ["选择", "取消"], function () {
144 var resObj = layui.reslist().getData(); 146 var resObj = layui.reslist().getData();
145 - if(resObj && resObj.length > 0){ 147 + if (resObj && resObj.length > 0) {
146 var resIds = []; 148 var resIds = [];
147 - $.each(resObj,function (i,v){ 149 + $.each(resObj, function (i, v) {
148 resIds.push(v.resId); 150 resIds.push(v.resId);
149 }) 151 })
150 admin.req({ 152 admin.req({
151 - url : domainName + '/api-web/manage/resource/alarmTemplate?resIds='+resIds.toString()+'&alarmTempId='+tempIds.toString()+'&access_token='+accessToken,  
152 - done:function (res){  
153 - if(res.success){  
154 - layer.msg("配置成功！", { offset: '15px' , icon: 1 , time: 1000 },function (){ 153 + url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString() + '&alarmTempId=' + tempIds.toString() + '&access_token=' + accessToken,
  154 + done: function (res) {
  155 + if (res.success) {
  156 + layer.msg("配置成功！", {offset: '15px', icon: 1, time: 1000}, function () {
155 layer.closeAll(); 157 layer.closeAll();
156 reloadalarmtemplateTable(); 158 reloadalarmtemplateTable();
157 }); 159 });
158 - }else{  
159 - layer.msg("配置失败，请重试或者与管理员联系！", { offset: '15px' , icon: 7 , time: 1000 }); 160 + } else {
  161 + layer.msg("配置失败，请重试或者与管理员联系！", {offset: '15px', icon: 7, time: 1000});
160 } 162 }
161 } 163 }
162 }); 164 });
@@ -174,13 +176,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -174,13 +176,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
174 $('#alarmtemplate_unbindRes').unbind('click').on('click', function () { 176 $('#alarmtemplate_unbindRes').unbind('click').on('click', function () {
175 var tempIds = []; 177 var tempIds = [];
176 var checks = table.checkStatus('alarmtemplateTable').data; 178 var checks = table.checkStatus('alarmtemplateTable').data;
177 - if(checks && checks.length > 0){  
178 - $.each(checks,function (i,obj) { 179 + if (checks && checks.length > 0) {
  180 + $.each(checks, function (i, obj) {
179 tempIds.push(obj.alarmTempId); 181 tempIds.push(obj.alarmTempId);
180 }); 182 });
181 } 183 }
182 if (tempIds.length == 0) { 184 if (tempIds.length == 0) {
183 - layer.msg('请选择数据',{icon: 7,time:2000}); 185 + layer.msg('请选择数据', {icon: 7, time: 2000});
184 return; 186 return;
185 } 187 }
186 layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) { 188 layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) {
@@ -222,18 +224,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -222,18 +224,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
222 var alarmtemplateTable = table.render({ 224 var alarmtemplateTable = table.render({
223 elem: '#alarmtemplateTable' 225 elem: '#alarmtemplateTable'
224 , url: domainName + '/api-web/alarmtemplate/page' 226 , url: domainName + '/api-web/alarmtemplate/page'
225 - , where:{  
226 - access_token:accessToken,  
227 - alarmTempName:$("#alarmtemplatekw").val(),  
228 - policyId:policyId, 227 + , where: {
  228 + access_token: accessToken,
  229 + alarmTempName: $("#alarmtemplatekw").val(),
  230 + policyId: policyId,
229 resIdList: resIdList 231 resIdList: resIdList
230 } 232 }
231 , height: 'full-200' 233 , height: 'full-200'
232 , page: { 234 , page: {
233 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 235 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
234 - ,theme: '#1E9FFF'//自定义分页主题颜色 236 + , theme: '#1E9FFF'//自定义分页主题颜色
235 } 237 }
236 - , end: function(e){ 238 + , end: function (e) {
237 form.render(); 239 form.render();
238 } 240 }
239 , limit: 20 241 , limit: 20
@@ -245,40 +247,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -245,40 +247,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
245 templet: '<div><span data-id="{{d.alarmTempId}}" class="layui-table-link view-alarmtemplate-name">{{d.alarmTempName}}</span></div>' 247 templet: '<div><span data-id="{{d.alarmTempId}}" class="layui-table-link view-alarmtemplate-name">{{d.alarmTempName}}</span></div>'
246 } 248 }
247 // , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width:240} 249 // , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width:240}
248 - , {field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width:240,  
249 - templet:function (d){  
250 - if(d.policyTotal != '0'){ 250 + , {
  251 + field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width: 240,
  252 + templet: function (d) {
  253 + if (d.policyTotal != '0') {
251 return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-policy-total">${d.policyTotal}</span></div>`; 254 return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-policy-total">${d.policyTotal}</span></div>`;
252 - }else{ 255 + } else {
253 return d.policyTotal; 256 return d.policyTotal;
254 } 257 }
255 - }}  
256 - , {field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width:240,  
257 - templet:function (d){  
258 - if(d.resTotal != '0'){ 258 + }
  259 + }
  260 + , {
  261 + field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width: 240,
  262 + templet: function (d) {
  263 + if (d.resTotal != '0') {
259 return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-res-total">${d.resTotal}</span></div>`; 264 return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-res-total">${d.resTotal}</span></div>`;
260 - }else{ 265 + } else {
261 return d.resTotal; 266 return d.resTotal;
262 } 267 }
263 - }}  
264 - , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:200,  
265 - templet: function(d){  
266 - if(d.syncFlag == 0){ //未同步 268 + }
  269 + }
  270 + , {
  271 + field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 200,
  272 + templet: function (d) {
  273 + if (d.syncFlag == 0) { //未同步
267 return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplate" lay-text="已同步|未同步">`; 274 return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplate" lay-text="已同步|未同步">`;
268 - }else{ 275 + } else {
269 return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; 276 return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
270 } 277 }
271 } 278 }
272 } 279 }
273 - , {title: '操作', align: 'center',width:'10%',fixed: 'right', 280 + , {
  281 + title: '操作', align: 'center', width: '10%', fixed: 'right',
274 templet: '<div>' + 282 templet: '<div>' +
275 - '<button data-id="{{d.alarmTempId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmtemplate-btn"><i class="layui-icon layui-icon-delete"></i></button>'+ 283 + '<button data-id="{{d.alarmTempId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmtemplate-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
276 '</div>' 284 '</div>'
277 } 285 }
278 ]], 286 ]],
279 - done:function () { 287 + done: function () {
280 //点击名称编辑 288 //点击名称编辑
281 - $(".view-alarmtemplate-name").on("click",function () { 289 + $(".view-alarmtemplate-name").on("click", function () {
282 if ($.inArray('back:alarmtemp:update', checkList) == -1) { 290 if ($.inArray('back:alarmtemp:update', checkList) == -1) {
283 layer.msg('暂无权限!', {icon: 7, time: 3000}); 291 layer.msg('暂无权限!', {icon: 7, time: 3000});
284 return; 292 return;
@@ -287,26 +295,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -287,26 +295,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
287 }); 295 });
288 296
289 //查看模板的策略数 297 //查看模板的策略数
290 - $(".view-alarmtemplate-policy-total").on("click",function (){ 298 + $(".view-alarmtemplate-policy-total").on("click", function () {
291 $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); 299 $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click');
292 var id = $(this).data("id"); 300 var id = $(this).data("id");
293 admin.req({ 301 admin.req({
294 - url:domainName + '/api-web/alarmPolicy/getbytempId/'+id  
295 - ,done:function (res){  
296 - if(res.data && res.data.length > 0){ 302 + url: domainName + '/api-web/alarmPolicy/getbytempId/' + id
  303 + , done: function (res) {
  304 + if (res.data && res.data.length > 0) {
297 var trs = ''; 305 var trs = '';
298 - $.each(res.data,function (i,d){ 306 + $.each(res.data, function (i, d) {
299 var isDefault = ''; 307 var isDefault = '';
300 - if(d.policyType == '1'){ //默认 308 + if (d.policyType == '1') { //默认
301 isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; 309 isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>';
302 - }else{ 310 + } else {
303 isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; 311 isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>';
304 } 312 }
305 var kpiIdent = ''; 313 var kpiIdent = '';
306 - if(d.kpiIdent == '0'){ kpiIdent = "基本指标";}  
307 - if(d.kpiIdent == '1'){ kpiIdent = "性能指标";}  
308 - if(d.kpiIdent == '2'){ kpiIdent = "状态指标";}  
309 - if(d.kpiIdent == '3'){ kpiIdent = "告警指标";} 314 + if (d.kpiIdent == '0') {
  315 + kpiIdent = "基本指标";
  316 + }
  317 + if (d.kpiIdent == '1') {
  318 + kpiIdent = "性能指标";
  319 + }
  320 + if (d.kpiIdent == '2') {
  321 + kpiIdent = "状态指标";
  322 + }
  323 + if (d.kpiIdent == '3') {
  324 + kpiIdent = "告警指标";
  325 + }
310 trs += ` <tr data-id="${d.alarmPolicyId}"> 326 trs += ` <tr data-id="${d.alarmPolicyId}">
311 <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> 327 <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td>
312 <td>${isDefault}</td> 328 <td>${isDefault}</td>
@@ -327,7 +343,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -327,7 +343,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
327 , title: "告警策略" 343 , title: "告警策略"
328 , shade: 0.8 344 , shade: 0.8
329 , area: ['80%', '90%'] 345 , area: ['80%', '90%']
330 - , btn:["关闭"] 346 + , btn: ["关闭"]
331 , id: 'alarm_policy_by_tempId_index' //设定一个id，防止重复弹出 347 , id: 'alarm_policy_by_tempId_index' //设定一个id，防止重复弹出
332 , content: tb 348 , content: tb
333 }) 349 })
@@ -337,7 +353,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -337,7 +353,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
337 }); 353 });
338 354
339 //查看告警模板的资源数量 355 //查看告警模板的资源数量
340 - $(".view-alarmtemplate-res-total").on("click",function (){ 356 + $(".view-alarmtemplate-res-total").on("click", function () {
341 var alarmTempId = $(this).data("id"); 357 var alarmTempId = $(this).data("id");
342 common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["关闭"], function () { 358 common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["关闭"], function () {
343 return true; 359 return true;
@@ -345,13 +361,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -345,13 +361,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
345 }); 361 });
346 362
347 //设置同步 363 //设置同步
348 - form.on('switch(switchSyncAlarmTemplate)', function(obj){ 364 + form.on('switch(switchSyncAlarmTemplate)', function (obj) {
349 var alarmtemplateId = obj.elem.id; 365 var alarmtemplateId = obj.elem.id;
350 syncAlarmTemplate(alarmtemplateId); 366 syncAlarmTemplate(alarmtemplateId);
351 }); 367 });
352 368
353 //删除 369 //删除
354 - $(".delete-alarmtemplate-btn").on("click",function () { 370 + $(".delete-alarmtemplate-btn").on("click", function () {
355 var id = $(this).data("id"); 371 var id = $(this).data("id");
356 deletealarmtemplate(id) 372 deletealarmtemplate(id)
357 }); 373 });
@@ -361,26 +377,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -361,26 +377,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
361 //刷新表格 377 //刷新表格
362 function reloadalarmtemplateTable() { 378 function reloadalarmtemplateTable() {
363 alarmtemplateTable.reload({ 379 alarmtemplateTable.reload({
364 - where:{  
365 - access_token:accessToken,  
366 - policyId:policyId,  
367 - resIdList:resIdList,  
368 - alarmTempName:$("#alarmtemplatekw").val() 380 + where: {
  381 + access_token: accessToken,
  382 + policyId: policyId,
  383 + resIdList: resIdList,
  384 + alarmTempName: $("#alarmtemplatekw").val()
369 } 385 }
370 }); 386 });
371 } 387 }
372 388
373 - function syncAlarmTemplate(tempId){ 389 + function syncAlarmTemplate(tempId) {
374 if (typeof (tempId) != "string") { 390 if (typeof (tempId) != "string") {
375 var ids = []; 391 var ids = [];
376 var data = table.checkStatus('alarmtemplateTable').data; 392 var data = table.checkStatus('alarmtemplateTable').data;
377 - if(data && data.length > 0){  
378 - $.each(data,function (i,obj) { 393 + if (data && data.length > 0) {
  394 + $.each(data, function (i, obj) {
379 ids.push(obj.alarmTempId); 395 ids.push(obj.alarmTempId);
380 }); 396 });
381 } 397 }
382 if (ids.length == 0) { 398 if (ids.length == 0) {
383 - layer.msg('请选择要同步的数据',{icon: 7,time:2000}); 399 + layer.msg('请选择要同步的数据', {icon: 7, time: 2000});
384 return; 400 return;
385 } 401 }
386 tempId = ids.toString(); 402 tempId = ids.toString();
@@ -399,18 +415,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -399,18 +415,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
399 }); 415 });
400 416
401 admin.req({ 417 admin.req({
402 - url:common.domainName + '/api-web/alarmtemplate/sync'  
403 - , data:{  
404 - ids:tempId 418 + url: common.domainName + '/api-web/alarmtemplate/sync'
  419 + , data: {
  420 + ids: tempId
405 } 421 }
406 }).done(function (res) { 422 }).done(function (res) {
407 layer.close(syncalarmtempload) 423 layer.close(syncalarmtempload)
408 - if(res.success){  
409 - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ 424 + if (res.success) {
  425 + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () {
410 reloadalarmtemplateTable(); 426 reloadalarmtemplateTable();
411 }); 427 });
412 - }else{  
413 - layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000}); 428 + } else {
  429 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000});
414 } 430 }
415 431
416 }); 432 });
@@ -425,13 +441,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -425,13 +441,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
425 if (typeof (id) != "string") { 441 if (typeof (id) != "string") {
426 var ids = []; 442 var ids = [];
427 var data = table.checkStatus('alarmtemplateTable').data; 443 var data = table.checkStatus('alarmtemplateTable').data;
428 - if(data && data.length > 0){  
429 - $.each(data,function (i,obj) { 444 + if (data && data.length > 0) {
  445 + $.each(data, function (i, obj) {
430 ids.push(obj.alarmTempId); 446 ids.push(obj.alarmTempId);
431 }); 447 });
432 } 448 }
433 if (ids.length == 0) { 449 if (ids.length == 0) {
434 - layer.msg('请选择要删除的数据',{icon: 7,time:2000}); 450 + layer.msg('请选择要删除的数据', {icon: 7, time: 2000});
435 return; 451 return;
436 } 452 }
437 id = ids.toString(); 453 id = ids.toString();
@@ -442,17 +458,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -442,17 +458,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
442 }, function () { 458 }, function () {
443 admin.req({ 459 admin.req({
444 url: common.domainName + '/api-web/alarmtemplate/delete' 460 url: common.domainName + '/api-web/alarmtemplate/delete'
445 - ,type:"delete"  
446 - ,data:{ids:id} 461 + , type: "delete"
  462 + , data: {ids: id}
447 }).done(function (res) { 463 }).done(function (res) {
448 - if(res.success){ 464 + if (res.success) {
449 layer.msg('删除成功', { 465 layer.msg('删除成功', {
450 - offset: '15px' , icon: 1 , time: 2000 466 + offset: '15px', icon: 1, time: 2000
451 }, function () { 467 }, function () {
452 reloadalarmtemplateTable(); 468 reloadalarmtemplateTable();
453 }); 469 });
454 - }else{  
455 - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 2000 }); 470 + } else {
  471 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000});
456 } 472 }
457 473
458 }).error(function (error) { 474 }).error(function (error) {
@@ -460,6 +476,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -460,6 +476,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
460 }); 476 });
461 }); 477 });
462 } 478 }
463 - return { reloadtemplate: reloadalarmtemplateTable}; 479 +
  480 + return {reloadtemplate: reloadalarmtemplateTable};
464 }); 481 });
465 }); 482 });
@@ -268,6 +268,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -268,6 +268,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
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 noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val(); 275 noticeTimely.site = $('#notice_timely_select').val() + $('#notice_timely_site').val();
272 //获取配置参数 276 //获取配置参数
273 var map = getParam(); 277 var map = getParam();