monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 80d4146de1c75bd8a8cb413280e6c47a59c57d91 2 parents 4ec911b2 45ed0c1a

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

消除告警时判断是否已存入草稿



See merge request !529
Inline Side-by-side
Showing 2 changed files with 56 additions and 23 deletions
@@ -279,18 +279,35 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -279,18 +279,35 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
279 } 279 }
280 } 280 }
281 urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=active'; 281 urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=active';
282 - layer.open({  
283 - title: ['告警消除', 'font-size:18px;'],  
284 - type: 2,  
285 - area: ['80%', '90%'],  
286 - shadeClose: true,//开启遮罩层  
287 - id: 'alarms_clear_id',  
288 - // content: laytpl(res.body).render(JSON.stringify(params)),  
289 - content: ['/vue3/index.html#/alarmsClearEditor?'+urlParams, 'no'],  
290 - cancel: function () {  
291 - clearTimeout(); 282 + //判断告警是否已经存入消除草稿 lsq 2022-04-14
  283 + admin.req({
  284 + url: common.domainName + '/api-web/bAlarmManage/manageInto',
  285 + type: "get",
  286 + data: {
  287 + alarmId: params.id
  288 + },
  289 + done: function (data) {
  290 + if(data.data && data.data.length>0){
  291 + //已存入了草稿
  292 + layer.msg('告警消除已存入草稿中了！', {icon: 2, time: 2000});
  293 + }else{
  294 + layer.open({
  295 + title: ['告警消除', 'font-size:18px;'],
  296 + type: 2,
  297 + area: ['80%', '90%'],
  298 + shadeClose: true,//开启遮罩层
  299 + id: 'alarms_clear_id',
  300 + // content: laytpl(res.body).render(JSON.stringify(params)),
  301 + content: ['/vue3/index.html#/alarmsClearEditor?'+urlParams, 'no'],
  302 + cancel: function () {
  303 + clearTimeout();
  304 + }
  305 + });
  306 + }
292 } 307 }
293 - }); 308 + })
  309 +
  310 +
294 /////////////////////////// 311 ///////////////////////////
295 }else{ 312 }else{
296 //不开启闭环 313 //不开启闭环
@@ -337,7 +354,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -337,7 +354,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
337 }); 354 });
338 355
339 $("#alarms_clear_id").find('textarea.layui-layer-input').attr("placeholder", clearReson); 356 $("#alarms_clear_id").find('textarea.layui-layer-input').attr("placeholder", clearReson);
340 - $("#alarms_clear_id").append('<div style="padding-top: 15px;"><span>是否通知：</span> ' + 357 + $("#alarms_clear_id").append('<div style="padding-top: 15px;"><span>是否通知：</span> ' +
341 '<input type="radio" name="noticeFlag" value="true" title="是" >&nbsp;是' + 358 '<input type="radio" name="noticeFlag" value="true" title="是" >&nbsp;是' +
342 '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;">&nbsp;否</div> '); 359 '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;">&nbsp;否</div> ');
343 } 360 }
@@ -423,18 +423,34 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -423,18 +423,34 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
423 } 423 }
424 } 424 }
425 urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=his'; 425 urlParams=urlParams.substr(0,urlParams.length-1)+'&alarmTypeCustom=his';
426 - layer.open({  
427 - title: ['告警消除', 'font-size:18px;'],  
428 - type: 2,  
429 - area: ['80%', '90%'],  
430 - shadeClose: true,//开启遮罩层  
431 - id: 'alarms_clear_id',  
432 - // content: laytpl(res.body).render(JSON.stringify(params)),  
433 - content: ['/vue3/index.html#/alarmsClearEditor?'+urlParams, 'no'],  
434 - cancel: function () {  
435 - clearTimeout(); 426 + //判断告警是否已经存入消除草稿 lsq 2022-04-14
  427 + admin.req({
  428 + url: common.domainName + '/api-web/bAlarmManage/manageInto',
  429 + type: "get",
  430 + data: {
  431 + alarmId: params.id
  432 + },
  433 + done: function (data) {
  434 + if(data.data && data.data.length>0){
  435 + //已存入了草稿
  436 + layer.msg('告警消除已存入草稿中了！', {icon: 2, time: 2000});
  437 + }else{
  438 + layer.open({
  439 + title: ['告警消除', 'font-size:18px;'],
  440 + type: 2,
  441 + area: ['80%', '90%'],
  442 + shadeClose: true,//开启遮罩层
  443 + id: 'alarms_clear_id',
  444 + // content: laytpl(res.body).render(JSON.stringify(params)),
  445 + content: ['/vue3/index.html#/alarmsClearEditor?'+urlParams, 'no'],
  446 + cancel: function () {
  447 + clearTimeout();
  448 + }
  449 + });
  450 + }
436 } 451 }
437 - }); 452 + })
  453 +
438 }) 454 })
439 }else{ 455 }else{
440 $('[history-data-warn-clear]').hide(); 456 $('[history-data-warn-clear]').hide();