monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 06a782a288b464a8b9fc3463e758273af95d791d 2 parents edfd72ec b23e5559

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 3 changed files with 14 additions and 8 deletions
@@ -28,7 +28,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -28,7 +28,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
28 $('#alarmpolicy_policyType_add').html(htmlRadio); 28 $('#alarmpolicy_policyType_add').html(htmlRadio);
29 }); 29 });
30 //编辑 30 //编辑
31 - debugger  
32 if (data && data.id) { 31 if (data && data.id) {
33 // 获取通知合并策略的表达式 32 // 获取通知合并策略的表达式
34 admin.req({ 33 admin.req({
@@ -225,6 +224,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -225,6 +224,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
225 data.seriousTimes = $("#seriousTimes").val(); 224 data.seriousTimes = $("#seriousTimes").val();
226 data.importantTimes = $("#seriousTimes").val(); 225 data.importantTimes = $("#seriousTimes").val();
227 data.commonlyTimes = $("#seriousTimes").val(); 226 data.commonlyTimes = $("#seriousTimes").val();
  227 + data.policyType = $("#alarmpolicy_policyType_add").val();
228 var that = this; 228 var that = this;
229 229
230 if (!data.kpiId) { 230 if (!data.kpiId) {
@@ -91,12 +91,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -91,12 +91,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
91 admin.req({ 91 admin.req({
92 url: domainName + '/api-web/alarmtemplate/config/policy' 92 url: domainName + '/api-web/alarmtemplate/config/policy'
93 , type: 'post' 93 , type: 'post'
  94 + , async: false
94 , data: {tempIds: tempIds.toString(), policyIds: policyIds.toString()} 95 , data: {tempIds: tempIds.toString(), policyIds: policyIds.toString()}
95 , done: function (res) { 96 , done: function (res) {
96 if (res.success) { 97 if (res.success) {
97 layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { 98 layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
98 layer.closeAll(); 99 layer.closeAll();
99 - reloadalarmtemplateTable();  
100 }); 100 });
101 } else { 101 } else {
102 layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); 102 layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
@@ -331,10 +331,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -331,10 +331,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
331 var trs = ''; 331 var trs = '';
332 $.each(res.data, function (i, d) { 332 $.each(res.data, function (i, d) {
333 var isDefault = ''; 333 var isDefault = '';
334 - if (d.policyType == '1') { //默认  
335 - isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>';  
336 - } else {  
337 - isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; 334 + switch (d.policyType){
  335 + case "1":
  336 + isDefault = "全局默认策略";
  337 + break;
  338 + case "2":
  339 + isDefault = "全局非默认策略";
  340 + break;
  341 + case "3":
  342 + isDefault = "模板策略";
  343 + break;
338 } 344 }
339 var kpiIdent = ''; 345 var kpiIdent = '';
340 if (d.kpiIdent == '0') { 346 if (d.kpiIdent == '0') {
@@ -53,8 +53,8 @@ @@ -53,8 +53,8 @@
53 </div> 53 </div>
54 <div class="layui-inline"> 54 <div class="layui-inline">
55 <div class="layui-input-inline"> 55 <div class="layui-input-inline">
56 - <select name="parentId" id="slt_res_manage_superior" lay-filter="slt_res_manage_superior">  
57 - 56 + <select name="parentId" id="slt_res_manage_superior" lay-filter="slt_res_manage_superior" lay-search="">
  57 +
58 </select> 58 </select>
59 </div> 59 </div>
60 </div> 60 </div>