monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 1ac1f0f4663c21384c004432ee8f41f1c8a06194 2 parents 86b6d69e f57f6b20

Merge branch 'master-mj-joke' into 'master-mj' 

fix:告警订阅删除失败问题处理

fix:告警订阅删除失败问题处理

See merge request !1163
Inline Side-by-side
Showing 4 changed files with 39 additions and 38 deletions
@@ -650,13 +650,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -650,13 +650,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
650 $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del", function () { 650 $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del", function () {
651 var id = $(this).attr("id"); 651 var id = $(this).attr("id");
652 admin.req({ 652 admin.req({
653 - url: common.domainName + '/api-web/alarmsubscribe/delete/ressub',  
654 - data: {id: id}, 653 + url: common.domainName + '/api-web/alarmsubscribe/delete/ressub?id='+id,
655 type: "delete", 654 type: "delete",
656 done: function (res) { 655 done: function (res) {
657 if (res.success) { 656 if (res.success) {
658 layer.msg("删除成功", {icon: 1, time: 3000}, function () { 657 layer.msg("删除成功", {icon: 1, time: 3000}, function () {
659 - //reloadalarmsubscribeTable(); 658 + reloadalarmsubscribeTable();
660 reloadTbody(); 659 reloadTbody();
661 }); 660 });
662 $("#" + id).parent().parent().remove(); 661 $("#" + id).parent().parent().remove();
@@ -776,8 +775,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -776,8 +775,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
776 $("span.resource_kpi_sublist_del").on("click", function () { 775 $("span.resource_kpi_sublist_del").on("click", function () {
777 var id = $(this).attr("id"); 776 var id = $(this).attr("id");
778 admin.req({ 777 admin.req({
779 - url: common.domainName + '/api-web/alarmsubscribe/delete/kpisub',  
780 - data: {id: id}, 778 + url: common.domainName + '/api-web/alarmsubscribe/delete/kpisub?id='+id,
781 type: "delete", 779 type: "delete",
782 done: function (res) { 780 done: function (res) {
783 if (res.success) { 781 if (res.success) {
@@ -806,7 +804,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -806,7 +804,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
806 common.openWin("template/res/typeSubscribeList", "选择资源类型", { 804 common.openWin("template/res/typeSubscribeList", "选择资源类型", {
807 subId: subId, 805 subId: subId,
808 type: 0 806 type: 0
809 - }, ["返回"], function () { 807 + }, ["确定"], function () {
810 reloadalarmsubscribeTable(); 808 reloadalarmsubscribeTable();
811 return true; 809 return true;
812 }); 810 });
@@ -822,7 +820,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -822,7 +820,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
822 common.openWin("template/res/typeSubscribeList", "选择业务系统", { 820 common.openWin("template/res/typeSubscribeList", "选择业务系统", {
823 subId: subId, 821 subId: subId,
824 type: 1 822 type: 1
825 - }, ["返回"], function () { 823 + }, ["确定"], function () {
826 reloadalarmsubscribeTable(); 824 reloadalarmsubscribeTable();
827 return true; 825 return true;
828 }); 826 });
@@ -1110,9 +1108,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1110,9 +1108,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1110 btn: ['确定', '取消'] //按钮 1108 btn: ['确定', '取消'] //按钮
1111 }, function () { 1109 }, function () {
1112 admin.req({ 1110 admin.req({
1113 - url: common.domainName + '/api-web/alarmsubscribe/delete' 1111 + url: common.domainName + '/api-web/alarmsubscribe/delete?ids='+id
1114 , type: "delete" 1112 , type: "delete"
1115 - , data: {ids: id}  
1116 }).done(function (res) { 1113 }).done(function (res) {
1117 layer.msg('删除成功', { 1114 layer.msg('删除成功', {
1118 offset: '15px' 1115 offset: '15px'
@@ -26,33 +26,36 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports @@ -26,33 +26,36 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
26 26
27 //保存 27 //保存
28 $("#alarmtemplate-form-save-id").on("click", function () { 28 $("#alarmtemplate-form-save-id").on("click", function () {
29 - var data = form.val("add-alarmtemplate-form");  
30 - var policyIds = [];  
31 - var policylist = $("#alarmtemplate-policy-table-body").find("tr");  
32 - if (policylist && policylist.length > 0) {  
33 - $.each(policylist, function (i, v) {  
34 - policyIds.push($(v).data("id"));  
35 - })  
36 - }  
37 - data.policyIds = policyIds.toString();  
38 - admin.req({  
39 - url: domainName + '/api-web/alarmtemplate/save'  
40 - , data: JSON.stringify(data)  
41 - , type: 'post'  
42 - , contentType: "application/json; charset=utf-8"  
43 - , done: function (res) {  
44 - if (res.success) {  
45 - layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {  
46 - layui.alarmtemplateIndex().reloadtemplate();  
47 - layer.closeAll();  
48 - });  
49 - } else {  
50 - layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});  
51 - } 29 + //lsq 告警模板编辑不了，id值应该选择的是submit的按钮的lay-filter 2022-09-27
  30 + form.on('submit(alarmtemplate-form-save-id)',function () {
  31 + var data = form.val("add-alarmtemplate-form");
  32 + var policyIds = [];
  33 + var policylist = $("#alarmtemplate-policy-table-body").find("tr");
  34 + if (policylist && policylist.length > 0) {
  35 + $.each(policylist, function (i, v) {
  36 + policyIds.push($(v).data("id"));
  37 + })
52 } 38 }
53 - }); 39 + data.policyIds = policyIds.toString();
  40 + admin.req({
  41 + url: domainName + '/api-web/alarmtemplate/save'
  42 + , data: JSON.stringify(data)
  43 + , type: 'post'
  44 + , contentType: "application/json; charset=utf-8"
  45 + , done: function (res) {
  46 + if (res.success) {
  47 + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
  48 + layui.alarmtemplateIndex().reloadtemplate();
  49 + layer.closeAll();
  50 + });
  51 + } else {
  52 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
  53 + }
  54 + }
  55 + });
54 56
55 - return false;//必须要写，解决禁用submit提交，ajax方法才能正确执行，且表单不会自动刷新 57 + return false;//必须要写，解决禁用submit提交，ajax方法才能正确执行，且表单不会自动刷新
  58 + });
56 }); 59 });
57 60
58 //选择策略 61 //选择策略
@@ -94,7 +97,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports @@ -94,7 +97,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
94 } 97 }
95 alarm_policy_tbody += ` 98 alarm_policy_tbody += `
96 <tr data-id="${d.alarmPolicyId}"> 99 <tr data-id="${d.alarmPolicyId}">
97 - <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> 100 + <td><div><span data-id="${d.alarmPolicyId}" class="view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td>
98 <td>${isDefault}</td> 101 <td>${isDefault}</td>
99 <td>${d.kpiName}</td> 102 <td>${d.kpiName}</td>
100 <td>${kpiIdent}</td> 103 <td>${kpiIdent}</td>
@@ -686,9 +686,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -686,9 +686,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
686 btn: ['确定', '取消'] //按钮 686 btn: ['确定', '取消'] //按钮
687 }, function () { 687 }, function () {
688 admin.req({ 688 admin.req({
689 - url: common.domainName + '/api-web/alarmtemplate/delete' 689 + url: common.domainName + '/api-web/alarmtemplate/delete?ids='+id
690 , type: "delete" 690 , type: "delete"
691 - , data: {ids: id}  
692 }).done(function (res) { 691 }).done(function (res) {
693 if (res.success) { 692 if (res.success) {
694 layer.msg('删除成功', { 693 layer.msg('删除成功', {
@@ -29,7 +29,9 @@ @@ -29,7 +29,9 @@
29 <div class="layui-form layui-form-pane"> 29 <div class="layui-form layui-form-pane">
30 <fieldset class="layui-elem-field layui-field-title"> 30 <fieldset class="layui-elem-field layui-field-title">
31 <legend>告警策略 31 <legend>告警策略
32 - <a class="layui-btn layui-btn-xs layui-btn-normal" id="add_alarmtemplate_policy"><i class="layui-icon">&#xe654;</i></a> 32 + <a class="layui-btn layui-btn-xs layui-btn-normal" id="add_alarmtemplate_policy">
  33 + 选择策略
  34 + </a>
33 </legend> 35 </legend>
34 </fieldset> 36 </fieldset>
35 <table class="layui-table"> 37 <table class="layui-table">