monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit ce8fef9847f39d1b8fec882d5cff771eaf491566 1 parent dcf972fc

优化加载下拉框

Inline Side-by-side
Showing 1 changed file with 331 additions and 375 deletions
1 //告警策略 1 //告警策略
2 -layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','table','xmSelect'], function (exports) { 2 +layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 'table', 'xmSelect'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var laydate = layui.laydate; 5 var laydate = layui.laydate;
@@ -12,7 +12,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -12,7 +12,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
12 exports('alarmpolicyAdd', function (data) { 12 exports('alarmpolicyAdd', function (data) {
13 var sessions = layui.sessions; 13 var sessions = layui.sessions;
14 var accessToken = sessions.getToken()['access_token']; 14 var accessToken = sessions.getToken()['access_token'];
15 - var seriousInkeySelect ; 15 + var seriousInkeySelect;
16 var options = ''; 16 var options = '';
17 var defaultoptions = ''; 17 var defaultoptions = '';
18 var conditionoptions = "<option value=\"6\">等于</option>\n" + 18 var conditionoptions = "<option value=\"6\">等于</option>\n" +
@@ -31,35 +31,38 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -31,35 +31,38 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
31 var importantInkeys = ''; 31 var importantInkeys = '';
32 var commonlyInkeys = ''; 32 var commonlyInkeys = '';
33 var policyConfigItems = []; 33 var policyConfigItems = [];
  34 + var devTypeOption = [];
  35 + var logjoinList = [];
  36 + var joinTypeOption = [];
34 form.render(null, 'add-alarmpolicy-form'); 37 form.render(null, 'add-alarmpolicy-form');
35 //初始化日期组件 38 //初始化日期组件
36 laydate.render({ 39 laydate.render({
37 elem: '#seriousTimes' 40 elem: '#seriousTimes'
38 - ,type: 'time'  
39 - ,range: true 41 + , type: 'time'
  42 + , range: true
40 }); 43 });
41 laydate.render({ 44 laydate.render({
42 elem: '#importantTimes' 45 elem: '#importantTimes'
43 - ,type: 'time'  
44 - ,range: true 46 + , type: 'time'
  47 + , range: true
45 }); 48 });
46 laydate.render({ 49 laydate.render({
47 elem: '#commonlyTimes' 50 elem: '#commonlyTimes'
48 - ,type: 'time'  
49 - ,range: true 51 + , type: 'time'
  52 + , range: true
50 }); 53 });
51 //编辑 54 //编辑
52 - if(data && data.id){ 55 + if (data && data.id) {
53 admin.req({ 56 admin.req({
54 - url:domainName + '/api-web/alarmPolicy/getbyId/'+data.id  
55 - ,done:function (res){ 57 + url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id
  58 + , done: function (res) {
56 exprToChar(res.object, 'alarmContentExpr'); 59 exprToChar(res.object, 'alarmContentExpr');
57 exprToChar(res.object, 'cleanPolicy'); 60 exprToChar(res.object, 'cleanPolicy');
58 exprToChar(res.object, 'commonlyExpr'); 61 exprToChar(res.object, 'commonlyExpr');
59 exprToChar(res.object, 'importantExpr'); 62 exprToChar(res.object, 'importantExpr');
60 exprToChar(res.object, 'seriousExpr'); 63 exprToChar(res.object, 'seriousExpr');
61 - form.val("add-alarmpolicy-form",res.object);  
62 - $("#alarm-policy-kpiName").val(res.object.kpiId +" "+ res.object.kpiName); 64 + form.val("add-alarmpolicy-form", res.object);
  65 + $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
63 $("#serious_policy_param_val").val(res.object.kpiId); 66 $("#serious_policy_param_val").val(res.object.kpiId);
64 $("#important_policy_param_val").val(res.object.kpiId); 67 $("#important_policy_param_val").val(res.object.kpiId);
65 $("#commonly_policy_param_val").val(res.object.kpiId); 68 $("#commonly_policy_param_val").val(res.object.kpiId);
@@ -67,31 +70,31 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -67,31 +70,31 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
67 $("#importantTimes").val(res.object.importantTimes); 70 $("#importantTimes").val(res.object.importantTimes);
68 $("#commonlyTimes").val(res.object.commonlyTimes); 71 $("#commonlyTimes").val(res.object.commonlyTimes);
69 $("#alarmPolicyType").val(res.object.policyType); 72 $("#alarmPolicyType").val(res.object.policyType);
70 - if(res.data && res.data.length>0){  
71 - let seriousItems = res.data.filter(item=>item.policyFlag === 'serious');  
72 - let importantItems = res.data.filter(item=>item.policyFlag === 'important');  
73 - let commonlyItems = res.data.filter(item=>item.policyFlag === 'commonly');  
74 - seriouspolicyItems =seriousItems; 73 + if (res.data && res.data.length > 0) {
  74 + let seriousItems = res.data.filter(item => item.policyFlag === 'serious');
  75 + let importantItems = res.data.filter(item => item.policyFlag === 'important');
  76 + let commonlyItems = res.data.filter(item => item.policyFlag === 'commonly');
  77 + seriouspolicyItems = seriousItems;
75 importantpolicyItems = importantItems; 78 importantpolicyItems = importantItems;
76 commonlypolicyItems = commonlyItems; 79 commonlypolicyItems = commonlyItems;
77 - if(seriousItems && seriousItems.length>0){ 80 + if (seriousItems && seriousItems.length > 0) {
78 81
79 - var timeobj ={} 82 + var timeobj = {}
80 for (let i = 0; i < seriousItems.length; i++) { 83 for (let i = 0; i < seriousItems.length; i++) {
81 var times = new Date().getTime(); 84 var times = new Date().getTime();
82 - timeobj['time'+i] =times; 85 + timeobj['time' + i] = times;
83 var cond = ''; 86 var cond = '';
84 - if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '0'){ 87 + if (seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '0') {
85 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition"> 88 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition">
86 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" > 89 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
87 </div>`; 90 </div>`;
88 - }else if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '1'){ 91 + } else if (seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '1') {
89 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition"> 92 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition">
90 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked> 93 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
91 </div>`; 94 </div>`;
92 } 95 }
93 var clone = "" 96 var clone = ""
94 - if(i<seriousItems.length-1) { 97 + if (i < seriousItems.length - 1) {
95 clone = $(`#serious-policy-box`).clone(); 98 clone = $(`#serious-policy-box`).clone();
96 clone.attr("id", "serious-policy-box-" + times).find("i.policy-input-add").addClass("hide") 99 clone.attr("id", "serious-policy-box-" + times).find("i.policy-input-add").addClass("hide")
97 .parent().parent().find("i.policy-input-del").attr("data-id", "serious-policy-box-" + times).removeClass("hide") 100 .parent().parent().find("i.policy-input-del").attr("data-id", "serious-policy-box-" + times).removeClass("hide")
@@ -101,39 +104,39 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -101,39 +104,39 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
101 clone.find("select.condition").html(conditionoptions); 104 clone.find("select.condition").html(conditionoptions);
102 clone.find("input[type=tel]").val(''); 105 clone.find("input[type=tel]").val('');
103 } 106 }
104 - if(i==0) { 107 + if (i == 0) {
105 $(`#serious-policy-box`).after(clone).after(cond); 108 $(`#serious-policy-box`).after(clone).after(cond);
106 $("#serious-policy-box select.condition").val(seriousItems[0].operatorSymbol); 109 $("#serious-policy-box select.condition").val(seriousItems[0].operatorSymbol);
107 $("#serious-policy-box input[type=tel]").val(seriousItems[0].operatorValue); 110 $("#serious-policy-box input[type=tel]").val(seriousItems[0].operatorValue);
108 - }else{  
109 - var timestr =timeobj['time'+(i-1)]; 111 + } else {
  112 + var timestr = timeobj['time' + (i - 1)];
110 $(`#serious-policy-box-${timestr}`).after(clone).after(cond); 113 $(`#serious-policy-box-${timestr}`).after(clone).after(cond);
111 $(`#serious-policy-box-${timestr} select.policyparam`).val(seriousItems[i].confNo); 114 $(`#serious-policy-box-${timestr} select.policyparam`).val(seriousItems[i].confNo);
112 $(`#serious-policy-box-${timestr} select.condition`).val(seriousItems[i].operatorSymbol); 115 $(`#serious-policy-box-${timestr} select.condition`).val(seriousItems[i].operatorSymbol);
113 $(`#serious-policy-box-${timestr} input[type=tel]`).val(seriousItems[i].operatorValue); 116 $(`#serious-policy-box-${timestr} input[type=tel]`).val(seriousItems[i].operatorValue);
114 - $(`#serious-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");  
115 - $(`#serious-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px"); 117 + $(`#serious-policy-box-${timestr} input[type=tel]`).attr("style", "width:480px");
  118 + $(`#serious-policy-box-${timestr} input[type=tel]`).parent().attr("style", "width:490px");
116 } 119 }
117 form.render(); 120 form.render();
118 } 121 }
119 } 122 }
120 - if(importantItems && importantItems.length>0){  
121 - var timeobj ={} 123 + if (importantItems && importantItems.length > 0) {
  124 + var timeobj = {}
122 for (let i = 0; i < importantItems.length; i++) { 125 for (let i = 0; i < importantItems.length; i++) {
123 var times = new Date().getTime(); 126 var times = new Date().getTime();
124 - timeobj['time'+i] =times; 127 + timeobj['time' + i] = times;
125 var cond = ''; 128 var cond = '';
126 - if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '0'){ 129 + if (importantItems[i].relationSymbol && importantItems[i].relationSymbol == '0') {
127 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition"> 130 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition">
128 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" > 131 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
129 </div>`; 132 </div>`;
130 - }else if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '1'){ 133 + } else if (importantItems[i].relationSymbol && importantItems[i].relationSymbol == '1') {
131 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition"> 134 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition">
132 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked> 135 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
133 </div>`; 136 </div>`;
134 } 137 }
135 var clone = "" 138 var clone = ""
136 - if(i<importantItems.length-1) { 139 + if (i < importantItems.length - 1) {
137 clone = $(`#important-policy-box`).clone(); 140 clone = $(`#important-policy-box`).clone();
138 clone.attr("id", "important-policy-box-" + times).find("i.policy-input-add").addClass("hide") 141 clone.attr("id", "important-policy-box-" + times).find("i.policy-input-add").addClass("hide")
139 .parent().parent().find("i.policy-input-del").attr("data-id", "important-policy-box-" + times).removeClass("hide") 142 .parent().parent().find("i.policy-input-del").attr("data-id", "important-policy-box-" + times).removeClass("hide")
@@ -143,39 +146,39 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -143,39 +146,39 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
143 clone.find("select.condition").html(conditionoptions); 146 clone.find("select.condition").html(conditionoptions);
144 clone.find("input[type=tel]").val(''); 147 clone.find("input[type=tel]").val('');
145 } 148 }
146 - if(i==0) { 149 + if (i == 0) {
147 $(`#important-policy-box`).after(clone).after(cond); 150 $(`#important-policy-box`).after(clone).after(cond);
148 $("#important-policy-box select.condition").val(importantItems[0].operatorSymbol); 151 $("#important-policy-box select.condition").val(importantItems[0].operatorSymbol);
149 $("#important-policy-box input[type=tel]").val(importantItems[0].operatorValue); 152 $("#important-policy-box input[type=tel]").val(importantItems[0].operatorValue);
150 - }else{  
151 - var timestr =timeobj['time'+(i-1)]; 153 + } else {
  154 + var timestr = timeobj['time' + (i - 1)];
152 $(`#important-policy-box-${timestr}`).after(clone).after(cond); 155 $(`#important-policy-box-${timestr}`).after(clone).after(cond);
153 $(`#important-policy-box-${timestr} select.policyparam`).val(importantItems[i].confNo); 156 $(`#important-policy-box-${timestr} select.policyparam`).val(importantItems[i].confNo);
154 $(`#important-policy-box-${timestr} select.condition`).val(importantItems[i].operatorSymbol); 157 $(`#important-policy-box-${timestr} select.condition`).val(importantItems[i].operatorSymbol);
155 $(`#important-policy-box-${timestr} input[type=tel]`).val(importantItems[i].operatorValue); 158 $(`#important-policy-box-${timestr} input[type=tel]`).val(importantItems[i].operatorValue);
156 - $(`#important-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");  
157 - $(`#important-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px"); 159 + $(`#important-policy-box-${timestr} input[type=tel]`).attr("style", "width:480px");
  160 + $(`#important-policy-box-${timestr} input[type=tel]`).parent().attr("style", "width:490px");
158 } 161 }
159 form.render(); 162 form.render();
160 } 163 }
161 } 164 }
162 - if(commonlyItems && commonlyItems.length>0){  
163 - var timeobj ={} 165 + if (commonlyItems && commonlyItems.length > 0) {
  166 + var timeobj = {}
164 for (let i = 0; i < commonlyItems.length; i++) { 167 for (let i = 0; i < commonlyItems.length; i++) {
165 var times = new Date().getTime(); 168 var times = new Date().getTime();
166 - timeobj['time'+i] =times; 169 + timeobj['time' + i] = times;
167 var cond = ''; 170 var cond = '';
168 - if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '0'){ 171 + if (commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '0') {
169 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition"> 172 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition">
170 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" > 173 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
171 </div>`; 174 </div>`;
172 - }else if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '1'){ 175 + } else if (commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '1') {
173 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition"> 176 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition">
174 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且"><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked> 177 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且"><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
175 </div>`; 178 </div>`;
176 } 179 }
177 var clone = "" 180 var clone = ""
178 - if(i<commonlyItems.length-1) { 181 + if (i < commonlyItems.length - 1) {
179 clone = $(`#commonly-policy-box`).clone(); 182 clone = $(`#commonly-policy-box`).clone();
180 clone.attr("id", "commonly-policy-box-" + times).find("i.policy-input-add").addClass("hide") 183 clone.attr("id", "commonly-policy-box-" + times).find("i.policy-input-add").addClass("hide")
181 .parent().parent().find("i.policy-input-del").attr("data-id", "commonly-policy-box-" + times).removeClass("hide") 184 .parent().parent().find("i.policy-input-del").attr("data-id", "commonly-policy-box-" + times).removeClass("hide")
@@ -185,18 +188,18 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -185,18 +188,18 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
185 clone.find("select.condition").html(conditionoptions); 188 clone.find("select.condition").html(conditionoptions);
186 clone.find("input[type=tel]").val(''); 189 clone.find("input[type=tel]").val('');
187 } 190 }
188 - if(i==0) { 191 + if (i == 0) {
189 $(`#commonly-policy-box`).after(clone).after(cond); 192 $(`#commonly-policy-box`).after(clone).after(cond);
190 $("#commonly-policy-box select.condition").val(commonlyItems[0].operatorSymbol); 193 $("#commonly-policy-box select.condition").val(commonlyItems[0].operatorSymbol);
191 $("#commonly-policy-box input[type=tel]").val(commonlyItems[0].operatorValue); 194 $("#commonly-policy-box input[type=tel]").val(commonlyItems[0].operatorValue);
192 - }else{  
193 - var timestr =timeobj['time'+(i-1)]; 195 + } else {
  196 + var timestr = timeobj['time' + (i - 1)];
194 $(`#commonly-policy-box-${timestr}`).after(clone).after(cond); 197 $(`#commonly-policy-box-${timestr}`).after(clone).after(cond);
195 $(`#commonly-policy-box-${timestr} select.policyparam`).val(commonlyItems[i].confNo); 198 $(`#commonly-policy-box-${timestr} select.policyparam`).val(commonlyItems[i].confNo);
196 $(`#commonly-policy-box-${timestr} select.condition`).val(commonlyItems[i].operatorSymbol); 199 $(`#commonly-policy-box-${timestr} select.condition`).val(commonlyItems[i].operatorSymbol);
197 $(`#commonly-policy-box-${timestr} input[type=tel]`).val(commonlyItems[i].operatorValue); 200 $(`#commonly-policy-box-${timestr} input[type=tel]`).val(commonlyItems[i].operatorValue);
198 - $(`#commonly-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");  
199 - $(`#commonly-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px"); 201 + $(`#commonly-policy-box-${timestr} input[type=tel]`).attr("style", "width:480px");
  202 + $(`#commonly-policy-box-${timestr} input[type=tel]`).parent().attr("style", "width:490px");
200 } 203 }
201 204
202 form.render(); 205 form.render();
@@ -206,7 +209,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -206,7 +209,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
206 } 209 }
207 } 210 }
208 }); 211 });
209 - }else{ 212 + } else {
210 $("#seriousTimes").val('00:00:00 - 23:59:59'); 213 $("#seriousTimes").val('00:00:00 - 23:59:59');
211 $("#importantTimes").val('00:00:00 - 23:59:59'); 214 $("#importantTimes").val('00:00:00 - 23:59:59');
212 $("#commonlyTimes").val('00:00:00 - 23:59:59'); 215 $("#commonlyTimes").val('00:00:00 - 23:59:59');
@@ -216,22 +219,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -216,22 +219,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
216 return false; 219 return false;
217 }); 220 });
218 //全天 221 //全天
219 - $(".allday").on("click",function (){ 222 + $(".allday").on("click", function () {
220 var id = $(this).data("flag"); 223 var id = $(this).data("flag");
221 - $("#"+id).val('00:00:00 - 23:59:59'); 224 + $("#" + id).val('00:00:00 - 23:59:59');
222 }); 225 });
223 //工作时间 226 //工作时间
224 - $(".worktime").on("click",function (){ 227 + $(".worktime").on("click", function () {
225 var id = $(this).data("flag"); 228 var id = $(this).data("flag");
226 - $("#"+id).val('08:00:00 - 19:59:59'); 229 + $("#" + id).val('08:00:00 - 19:59:59');
227 }); 230 });
228 //指标信息 231 //指标信息
229 - if(data.kpiId){ 232 + if (data.kpiId) {
230 $("#alarm-policy-kpiId").val(data.kpiId); 233 $("#alarm-policy-kpiId").val(data.kpiId);
231 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name); 234 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name);
232 } 235 }
233 initpolicyParam(); 236 initpolicyParam();
  237 +
234 function initpolicyParam() { 238 function initpolicyParam() {
  239 + $.ajax({
  240 + url: "http://192.168.0.44:8080" + "/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token=" + accessToken,
  241 + method: "get",
  242 + success(res) {
  243 + if (res.code == 200)
  244 + // 资源类型下拉框
  245 + devTypeOption = handleTree(res.data, 'id', 'pId', 'children', 'name');
  246 + }
  247 + });
  248 + $.ajax({
  249 + url: "http://192.168.0.44:8080" + "/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token=" + accessToken,
  250 + method: "get",
  251 + success(res) {
  252 + if (res.code == 200)
  253 + // 资源类型下拉框
  254 + joinTypeOption = handleTree(res.data, 'id', 'pId', 'children', 'name');
  255 + }
  256 + });
  257 + admin.req({
  258 + url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,
  259 + async: false,
  260 + success: function (res) {
  261 + // 资源类型下拉框
  262 + logjoinList = res.data;
  263 + }
  264 + });
235 admin.req({ 265 admin.req({
236 url: `${domainName}/api-web/manage/ddic/findSucDdics/alarmpolicy_param?access_token=${accessToken}`, 266 url: `${domainName}/api-web/manage/ddic/findSucDdics/alarmpolicy_param?access_token=${accessToken}`,
237 method: 'POST', 267 method: 'POST',
@@ -239,13 +269,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -239,13 +269,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
239 success: function (res) { 269 success: function (res) {
240 var ddiclist = res.data; 270 var ddiclist = res.data;
241 $.each(ddiclist, function (i, v) { 271 $.each(ddiclist, function (i, v) {
242 - if(v.ddicCode=="current_kpi") { 272 + if (v.ddicCode == "current_kpi") {
243 defaultoptions += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>'; 273 defaultoptions += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
244 $('select[name=serious_policy_param]').html(defaultoptions); 274 $('select[name=serious_policy_param]').html(defaultoptions);
245 $('select[name=important_policy_param]').html(defaultoptions); 275 $('select[name=important_policy_param]').html(defaultoptions);
246 $('select[name=commonly_policy_param]').html(defaultoptions); 276 $('select[name=commonly_policy_param]').html(defaultoptions);
247 277
248 - }else { 278 + } else {
249 options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>'; 279 options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
250 } 280 }
251 }); 281 });
@@ -253,6 +283,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -253,6 +283,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
253 } 283 }
254 }); 284 });
255 } 285 }
  286 +
256 function handleTree(data, id, parentId, children, title) { 287 function handleTree(data, id, parentId, children, title) {
257 let config = { 288 let config = {
258 id: id || 'id', 289 id: id || 'id',
@@ -303,29 +334,29 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -303,29 +334,29 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
303 return tree; 334 return tree;
304 }; 335 };
305 336
306 - form.on('select(serious_policy_param)', function(data){  
307 - var seriousvalue =$(this).closest(".cont-base").find("div#seriousvalue");  
308 - var devTypevalue =$(this).closest(".cont-base").find("div#seriousdevTypevalue");  
309 - var joinTypevalue =$(this).closest(".cont-base").find("div#seriousjoinTypevalue"); 337 + form.on('select(serious_policy_param)', function (data) {
  338 + var seriousvalue = $(this).closest(".cont-base").find("div#seriousvalue");
  339 + var devTypevalue = $(this).closest(".cont-base").find("div#seriousdevTypevalue");
  340 + var joinTypevalue = $(this).closest(".cont-base").find("div#seriousjoinTypevalue");
310 341
311 - var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]");  
312 - if(seriousvalue){ 342 + var commondevTypevalue = $(this).closest(".cont-base").find("div[id^=devTypevalue-]");
  343 + if (seriousvalue) {
313 seriousvalue.remove(); 344 seriousvalue.remove();
314 } 345 }
315 - if(devTypevalue){ 346 + if (devTypevalue) {
316 devTypevalue.remove(); 347 devTypevalue.remove();
317 } 348 }
318 - if(joinTypevalue){ 349 + if (joinTypevalue) {
319 joinTypevalue.remove(); 350 joinTypevalue.remove();
320 } 351 }
321 - if(commondevTypevalue){ 352 + if (commondevTypevalue) {
322 commondevTypevalue.remove(); 353 commondevTypevalue.remove();
323 } 354 }
324 - if (data.value != ''){ 355 + if (data.value != '') {
325 //加载对应的参数 356 //加载对应的参数
326 - if(data.value == "device_id"){ 357 + if (data.value == "device_id") {
327 var device_id = $(this).closest(".cont-base").find("input[type=tel]"); 358 var device_id = $(this).closest(".cont-base").find("input[type=tel]");
328 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 359 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
329 common.openWin("template/res/reslist", "选择设备", {oldData: seriousresIds}, ["选择"], function () { 360 common.openWin("template/res/reslist", "选择设备", {oldData: seriousresIds}, ["选择"], function () {
330 var data = table.checkStatus('reslist_resListTable').data; 361 var data = table.checkStatus('reslist_resListTable').data;
331 if (data.length == 0) { 362 if (data.length == 0) {
@@ -336,7 +367,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -336,7 +367,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
336 var device = '' 367 var device = ''
337 if (data.length == 1) { 368 if (data.length == 1) {
338 device = data[0].id; 369 device = data[0].id;
339 - } else{ 370 + } else {
340 $.each(data, function (i, v) { 371 $.each(data, function (i, v) {
341 seriousresIds.push(v.id); 372 seriousresIds.push(v.id);
342 device += v.id + ','; 373 device += v.id + ',';
@@ -351,22 +382,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -351,22 +382,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
351 }) 382 })
352 }) 383 })
353 384
354 - }else if(data.value== "dev_type"){ 385 + } else if (data.value == "dev_type") {
355 //var dev_type = $(this).closest(".cont-base").find("input[type=tel]"); 386 //var dev_type = $(this).closest(".cont-base").find("input[type=tel]");
356 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 387 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
357 - var dev_type= $(this).closest(".cont-base").find("input[type=tel]");  
358 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
359 - $.ajax({  
360 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken,  
361 - method:"get",  
362 - success(res){  
363 - if (res.code==200)  
364 - // 资源类型下拉框  
365 - var data = res.data;  
366 - let option = handleTree(res.data, 'id', 'pId','children','name'); 388 + var dev_type = $(this).closest(".cont-base").find("input[type=tel]");
  389 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
367 xmSelect.render({ 390 xmSelect.render({
368 el: '#seriousdevTypevalue', 391 el: '#seriousdevTypevalue',
369 - name:'devType', 392 + name: 'devType',
370 tips: '=设备类型=', 393 tips: '=设备类型=',
371 radio: false, 394 radio: false,
372 clickClose: false, 395 clickClose: false,
@@ -396,36 +419,26 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -396,36 +419,26 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
396 //是否严格遵守父子模式 419 //是否严格遵守父子模式
397 strict: true 420 strict: true
398 }, 421 },
399 - data:option, 422 + data: devTypeOption,
400 on: function (data) { 423 on: function (data) {
401 seriousresTypes = data.arr.map(item => item.id).join(','); 424 seriousresTypes = data.arr.map(item => item.id).join(',');
402 dev_type.val(seriousresTypes); 425 dev_type.val(seriousresTypes);
403 - if(data && data.isAdd) { 426 + if (data && data.isAdd) {
404 //seriousvalue.remove(); 427 //seriousvalue.remove();
405 //inkeys.show(); 428 //inkeys.show();
406 } 429 }
407 return seriousresTypes 430 return seriousresTypes
408 } 431 }
409 }); 432 });
410 - return data;  
411 - }  
412 - }); 433 +
413 }); 434 });
414 - }else if(data.value == "join_type"){ 435 + } else if (data.value == "join_type") {
415 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 436 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
416 - var join_type= $(this).closest(".cont-base").find("input[type=tel]");  
417 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
418 - $.ajax({  
419 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken,  
420 - method:"get",  
421 - success(res){  
422 - if (res.code==200)  
423 - // 资源类型下拉框  
424 - var data = res.data;  
425 - let option = handleTree(res.data, 'id', 'pId','children','name'); 437 + var join_type = $(this).closest(".cont-base").find("input[type=tel]");
  438 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
426 xmSelect.render({ 439 xmSelect.render({
427 el: '#seriousjoinTypevalue', 440 el: '#seriousjoinTypevalue',
428 - name:'joinType', 441 + name: 'joinType',
429 tips: '=业务类型=', 442 tips: '=业务类型=',
430 radio: false, 443 radio: false,
431 clickClose: false, 444 clickClose: false,
@@ -455,33 +468,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -455,33 +468,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
455 //是否严格遵守父子模式 468 //是否严格遵守父子模式
456 strict: true 469 strict: true
457 }, 470 },
458 - data:option, 471 + data: joinTypeOption,
459 on: function (data) { 472 on: function (data) {
460 seriousJoinTypes = data.arr.map(item => item.id).join(','); 473 seriousJoinTypes = data.arr.map(item => item.id).join(',');
461 join_type.val(seriousJoinTypes); 474 join_type.val(seriousJoinTypes);
462 - if(data && data.isAdd) { 475 + if (data && data.isAdd) {
463 //seriousvalue.remove(); 476 //seriousvalue.remove();
464 //inkeys.show(); 477 //inkeys.show();
465 } 478 }
466 return seriousJoinTypes 479 return seriousJoinTypes
467 } 480 }
468 }); 481 });
469 - return data;  
470 - }  
471 }); 482 });
472 - });  
473 - }else if(data.value == "inKey"){ 483 + } else if (data.value == "inKey") {
474 //绑定资源类型下拉选择 484 //绑定资源类型下拉选择
475 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 485 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
476 - var inkeys= $(this).closest(".cont-base").find("input[type=tel]");  
477 - //inkeys.hide();  
478 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
479 - admin.req({  
480 - url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,  
481 - async: false,  
482 - success: function (res) {  
483 - // 资源类型下拉框  
484 - var logjoinList = res.data; 486 + var inkeys = $(this).closest(".cont-base").find("input[type=tel]");
  487 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
485 xmSelect.render({ 488 xmSelect.render({
486 el: '#seriousvalue', 489 el: '#seriousvalue',
487 tips: '=接入名称=', 490 tips: '=接入名称=',
@@ -503,42 +506,41 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -503,42 +506,41 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
503 on: function (data) { 506 on: function (data) {
504 seriousInkeys = data.arr.map(item => item.inKey).join(','); 507 seriousInkeys = data.arr.map(item => item.inKey).join(',');
505 inkeys.val(seriousInkeys); 508 inkeys.val(seriousInkeys);
506 - if(data && data.isAdd) { 509 + if (data && data.isAdd) {
507 //seriousvalue.remove(); 510 //seriousvalue.remove();
508 //inkeys.show(); 511 //inkeys.show();
509 } 512 }
510 return seriousInkeys 513 return seriousInkeys
511 } 514 }
512 }); 515 });
513 - }  
514 }); 516 });
515 - })  
516 } 517 }
  518 +
517 } 519 }
518 }); 520 });
519 - form.on('select(important_policy_param)', function(data){  
520 - var importantvalue =$(this).closest(".cont-base").find("div#importantvalue");  
521 - if(importantvalue){ 521 + form.on('select(important_policy_param)', function (data) {
  522 + var importantvalue = $(this).closest(".cont-base").find("div#importantvalue");
  523 + if (importantvalue) {
522 importantvalue.remove(); 524 importantvalue.remove();
523 } 525 }
524 - var devTypevalue =$(this).closest(".cont-base").find("div#importantdevTypevalue");  
525 - var joinTypevalue =$(this).closest(".cont-base").find("div#importantjoinTypevalue");  
526 - var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]"); 526 + var devTypevalue = $(this).closest(".cont-base").find("div#importantdevTypevalue");
  527 + var joinTypevalue = $(this).closest(".cont-base").find("div#importantjoinTypevalue");
  528 + var commondevTypevalue = $(this).closest(".cont-base").find("div[id^=devTypevalue-]");
527 529
528 - if(devTypevalue){ 530 + if (devTypevalue) {
529 devTypevalue.remove(); 531 devTypevalue.remove();
530 } 532 }
531 - if(joinTypevalue){ 533 + if (joinTypevalue) {
532 joinTypevalue.remove(); 534 joinTypevalue.remove();
533 } 535 }
534 - if(commondevTypevalue){ 536 + if (commondevTypevalue) {
535 commondevTypevalue.remove(); 537 commondevTypevalue.remove();
536 } 538 }
537 - if (data.value != ''){ 539 + if (data.value != '') {
538 //加载对应的参数 540 //加载对应的参数
539 - if(data.value == "device_id"){ 541 + if (data.value == "device_id") {
540 var device_id = $(this).closest(".cont-base").find("input[type=tel]"); 542 var device_id = $(this).closest(".cont-base").find("input[type=tel]");
541 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 543 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
542 common.openWin("template/res/reslist", "选择设备", {oldData: importantresIds}, ["选择"], function () { 544 common.openWin("template/res/reslist", "选择设备", {oldData: importantresIds}, ["选择"], function () {
543 var data = table.checkStatus('reslist_resListTable').data; 545 var data = table.checkStatus('reslist_resListTable').data;
544 if (data.length == 0) { 546 if (data.length == 0) {
@@ -549,11 +551,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -549,11 +551,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
549 var device = '' 551 var device = ''
550 $.each(data, function (i, v) { 552 $.each(data, function (i, v) {
551 importantresIds.push(v.id); 553 importantresIds.push(v.id);
552 - device +=v.id + ','; 554 + device += v.id + ',';
553 555
554 }) 556 })
555 - if(device.length>0){  
556 - device = device.substring(0,device.length-1) 557 + if (device.length > 0) {
  558 + device = device.substring(0, device.length - 1)
557 } 559 }
558 console.log(device_id) 560 console.log(device_id)
559 device_id.val(device); 561 device_id.val(device);
@@ -561,21 +563,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -561,21 +563,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
561 }) 563 })
562 }) 564 })
563 565
564 - }else if(data.value== "dev_type"){ 566 + } else if (data.value == "dev_type") {
565 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 567 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
566 - var dev_type= $(this).closest(".cont-base").find("input[type=tel]");  
567 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
568 - $.ajax({  
569 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken,  
570 - method:"get",  
571 - success(res){  
572 - if (res.code==200)  
573 - // 资源类型下拉框  
574 - var data = res.data;  
575 - let option = handleTree(res.data, 'id', 'pId','children','name'); 568 + var dev_type = $(this).closest(".cont-base").find("input[type=tel]");
  569 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
  570 +
576 xmSelect.render({ 571 xmSelect.render({
577 el: '#importantdevTypevalue', 572 el: '#importantdevTypevalue',
578 - name:'importantdevType', 573 + name: 'importantdevType',
579 tips: '=设备类型=', 574 tips: '=设备类型=',
580 radio: false, 575 radio: false,
581 clickClose: false, 576 clickClose: false,
@@ -605,36 +600,26 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -605,36 +600,26 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
605 //是否严格遵守父子模式 600 //是否严格遵守父子模式
606 strict: true 601 strict: true
607 }, 602 },
608 - data:option, 603 + data: devTypeOption,
609 on: function (data) { 604 on: function (data) {
610 importantresTypes = data.arr.map(item => item.id).join(','); 605 importantresTypes = data.arr.map(item => item.id).join(',');
611 dev_type.val(importantresTypes); 606 dev_type.val(importantresTypes);
612 - if(data && data.isAdd) { 607 + if (data && data.isAdd) {
613 //seriousvalue.remove(); 608 //seriousvalue.remove();
614 //inkeys.show(); 609 //inkeys.show();
615 } 610 }
616 return importantresTypes; 611 return importantresTypes;
617 } 612 }
618 }); 613 });
619 - return data;  
620 - }  
621 - }); 614 +
622 }); 615 });
623 - }else if(data.value == "join_type"){ 616 + } else if (data.value == "join_type") {
624 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 617 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
625 - var join_type= $(this).closest(".cont-base").find("input[type=tel]");  
626 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
627 - $.ajax({  
628 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken,  
629 - method:"get",  
630 - success(res){  
631 - if (res.code==200)  
632 - // 资源类型下拉框  
633 - var data = res.data;  
634 - let option = handleTree(res.data, 'id', 'pId','children','name'); 618 + var join_type = $(this).closest(".cont-base").find("input[type=tel]");
  619 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
635 xmSelect.render({ 620 xmSelect.render({
636 el: '#importantjoinTypevalue', 621 el: '#importantjoinTypevalue',
637 - name:'importantjoinType', 622 + name: 'importantjoinType',
638 tips: '=业务类型=', 623 tips: '=业务类型=',
639 radio: false, 624 radio: false,
640 clickClose: false, 625 clickClose: false,
@@ -664,34 +649,25 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -664,34 +649,25 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
664 //是否严格遵守父子模式 649 //是否严格遵守父子模式
665 strict: true 650 strict: true
666 }, 651 },
667 - data:option, 652 + data: joinTypeOption,
668 on: function (data) { 653 on: function (data) {
669 importantJoinTypes = data.arr.map(item => item.id).join(','); 654 importantJoinTypes = data.arr.map(item => item.id).join(',');
670 join_type.val(importantJoinTypes); 655 join_type.val(importantJoinTypes);
671 - if(data && data.isAdd) { 656 + if (data && data.isAdd) {
672 //seriousvalue.remove(); 657 //seriousvalue.remove();
673 //inkeys.show(); 658 //inkeys.show();
674 } 659 }
675 return importantJoinTypes 660 return importantJoinTypes
676 } 661 }
677 }); 662 });
678 - return data;  
679 - }  
680 - });  
681 }); 663 });
682 - }else if(data.value == "inKey"){ 664 + } else if (data.value == "inKey") {
683 //绑定资源类型下拉选择 665 //绑定资源类型下拉选择
684 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 666 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
685 - var inkeys= $(this).closest(".cont-base").find("input[type=tel]"); 667 + var inkeys = $(this).closest(".cont-base").find("input[type=tel]");
686 //var importantvalue =$(this).closest(".cont-base").find("div#importantvalue"); 668 //var importantvalue =$(this).closest(".cont-base").find("div#importantvalue");
687 //inkeys.hide(); 669 //inkeys.hide();
688 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
689 - admin.req({  
690 - url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,  
691 - async: false,  
692 - success: function (res) {  
693 - // 资源类型下拉框  
694 - var logjoinList = res.data; 670 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
695 xmSelect.render({ 671 xmSelect.render({
696 el: '#importantvalue', 672 el: '#importantvalue',
697 tips: '=接入名称=', 673 tips: '=接入名称=',
@@ -706,7 +682,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -706,7 +682,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
706 layVerType: 'msg', 682 layVerType: 'msg',
707 toolbar: { 683 toolbar: {
708 show: true, 684 show: true,
709 - list: [ 'CLEAR'] 685 + list: ['CLEAR']
710 }, 686 },
711 height: 'auto', 687 height: 'auto',
712 data: logjoinList, 688 data: logjoinList,
@@ -720,35 +696,34 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -720,35 +696,34 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
720 return importantInkeys 696 return importantInkeys
721 } 697 }
722 }); 698 });
723 - }  
724 - }); 699 +
725 }) 700 })
726 } 701 }
727 } 702 }
728 }); 703 });
729 - form.on('select(commonly_policy_param)', function(data){  
730 - var commonlyvalue =$(this).closest(".cont-base").find("div#commonlyvalue");  
731 - if(commonlyvalue){ 704 + form.on('select(commonly_policy_param)', function (data) {
  705 + var commonlyvalue = $(this).closest(".cont-base").find("div#commonlyvalue");
  706 + if (commonlyvalue) {
732 commonlyvalue.remove(); 707 commonlyvalue.remove();
733 } 708 }
734 - var devTypevalue =$(this).closest(".cont-base").find("div#commonlydevTypevalue");  
735 - var joinTypevalue =$(this).closest(".cont-base").find("div#commonlyjoinTypevalue");  
736 - var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]"); 709 + var devTypevalue = $(this).closest(".cont-base").find("div#commonlydevTypevalue");
  710 + var joinTypevalue = $(this).closest(".cont-base").find("div#commonlyjoinTypevalue");
  711 + var commondevTypevalue = $(this).closest(".cont-base").find("div[id^=devTypevalue-]");
737 712
738 - if(devTypevalue){ 713 + if (devTypevalue) {
739 devTypevalue.remove(); 714 devTypevalue.remove();
740 } 715 }
741 - if(joinTypevalue){ 716 + if (joinTypevalue) {
742 joinTypevalue.remove(); 717 joinTypevalue.remove();
743 } 718 }
744 - if(commondevTypevalue){ 719 + if (commondevTypevalue) {
745 commondevTypevalue.remove(); 720 commondevTypevalue.remove();
746 } 721 }
747 - if (data.value != ''){ 722 + if (data.value != '') {
748 //加载对应的参数 723 //加载对应的参数
749 - if(data.value == "device_id"){ 724 + if (data.value == "device_id") {
750 var device_id = $(this).closest(".cont-base").find("input[type=tel]"); 725 var device_id = $(this).closest(".cont-base").find("input[type=tel]");
751 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 726 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
752 common.openWin("template/res/reslist", "选择设备", {oldData: commonlyresIds}, ["选择"], function () { 727 common.openWin("template/res/reslist", "选择设备", {oldData: commonlyresIds}, ["选择"], function () {
753 var data = table.checkStatus('reslist_resListTable').data; 728 var data = table.checkStatus('reslist_resListTable').data;
754 if (data.length == 0) { 729 if (data.length == 0) {
@@ -759,11 +734,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -759,11 +734,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
759 var device = '' 734 var device = ''
760 $.each(data, function (i, v) { 735 $.each(data, function (i, v) {
761 commonlyresIds.push(v.id); 736 commonlyresIds.push(v.id);
762 - device +=v.id + ','; 737 + device += v.id + ',';
763 738
764 }) 739 })
765 - if(device.length>0){  
766 - device = device.substring(0,device.length-1) 740 + if (device.length > 0) {
  741 + device = device.substring(0, device.length - 1)
767 } 742 }
768 //console.log(device_id) 743 //console.log(device_id)
769 device_id.val(device); 744 device_id.val(device);
@@ -771,21 +746,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -771,21 +746,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
771 }) 746 })
772 }) 747 })
773 748
774 - }else if(data.value== "dev_type"){ 749 + } else if (data.value == "dev_type") {
775 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlydevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 750 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlydevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
776 - var dev_type= $(this).closest(".cont-base").find("input[type=tel]");  
777 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
778 - $.ajax({  
779 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken,  
780 - method:"get",  
781 - success(res){  
782 - if (res.code==200)  
783 - // 资源类型下拉框  
784 - var data = res.data;  
785 - let option = handleTree(res.data, 'id', 'pId','children','name'); 751 + var dev_type = $(this).closest(".cont-base").find("input[type=tel]");
  752 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
786 xmSelect.render({ 753 xmSelect.render({
787 el: '#commonlydevTypevalue', 754 el: '#commonlydevTypevalue',
788 - name:'commonlydevType', 755 + name: 'commonlydevType',
789 tips: '=设备类型=', 756 tips: '=设备类型=',
790 radio: false, 757 radio: false,
791 clickClose: false, 758 clickClose: false,
@@ -815,36 +782,27 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -815,36 +782,27 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
815 //是否严格遵守父子模式 782 //是否严格遵守父子模式
816 strict: true 783 strict: true
817 }, 784 },
818 - data:option, 785 + data: devTypeOption,
819 on: function (data) { 786 on: function (data) {
820 commonlyresTypes = data.arr.map(item => item.id).join(','); 787 commonlyresTypes = data.arr.map(item => item.id).join(',');
821 dev_type.val(commonlyresTypes); 788 dev_type.val(commonlyresTypes);
822 - if(data && data.isAdd) { 789 + if (data && data.isAdd) {
823 //seriousvalue.remove(); 790 //seriousvalue.remove();
824 //inkeys.show(); 791 //inkeys.show();
825 } 792 }
826 return commonlyresTypes; 793 return commonlyresTypes;
827 } 794 }
828 }); 795 });
829 - return data;  
830 - }  
831 - }); 796 +
832 }); 797 });
833 - }else if(data.value == "join_type"){ 798 + } else if (data.value == "join_type") {
834 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 799 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
835 - var join_type= $(this).closest(".cont-base").find("input[type=tel]");  
836 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
837 - $.ajax({  
838 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken,  
839 - method:"get",  
840 - success(res){  
841 - if (res.code==200)  
842 - // 资源类型下拉框  
843 - var data = res.data;  
844 - let option = handleTree(res.data, 'id', 'pId','children','name'); 800 + var join_type = $(this).closest(".cont-base").find("input[type=tel]");
  801 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
  802 +
845 xmSelect.render({ 803 xmSelect.render({
846 el: '#commonlyjoinTypevalue', 804 el: '#commonlyjoinTypevalue',
847 - name:'commonlyjoinType', 805 + name: 'commonlyjoinType',
848 tips: '=业务类型=', 806 tips: '=业务类型=',
849 radio: false, 807 radio: false,
850 clickClose: false, 808 clickClose: false,
@@ -874,34 +832,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -874,34 +832,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
874 //是否严格遵守父子模式 832 //是否严格遵守父子模式
875 strict: true 833 strict: true
876 }, 834 },
877 - data:option, 835 + data: joinTypeOption,
878 on: function (data) { 836 on: function (data) {
879 commonlyJoinTypes = data.arr.map(item => item.id).join(','); 837 commonlyJoinTypes = data.arr.map(item => item.id).join(',');
880 join_type.val(commonlyJoinTypes); 838 join_type.val(commonlyJoinTypes);
881 - if(data && data.isAdd) { 839 + if (data && data.isAdd) {
882 //seriousvalue.remove(); 840 //seriousvalue.remove();
883 //inkeys.show(); 841 //inkeys.show();
884 } 842 }
885 return commonlyJoinTypes; 843 return commonlyJoinTypes;
886 } 844 }
887 }); 845 });
888 - return data;  
889 - }  
890 - });  
891 }); 846 });
892 - }else if(data.value == "inKey"){ 847 + } else if (data.value == "inKey") {
893 //绑定资源类型下拉选择 848 //绑定资源类型下拉选择
894 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); 849 $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
895 - var inkeys= $(this).closest(".cont-base").find("input[type=tel]");  
896 -  
897 - //inkeys.hide();  
898 - $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {  
899 - admin.req({  
900 - url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken,  
901 - async: false,  
902 - success: function (res) {  
903 - // 资源类型下拉框  
904 - var logjoinList = res.data; 850 + var inkeys = $(this).closest(".cont-base").find("input[type=tel]");
  851 + $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click", function () {
905 xmSelect.render({ 852 xmSelect.render({
906 el: '#commonlyvalue', 853 el: '#commonlyvalue',
907 tips: '=接入名称=', 854 tips: '=接入名称=',
@@ -923,15 +870,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -923,15 +870,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
923 on: function (data) { 870 on: function (data) {
924 commonlyInkeys = data.arr.map(item => item.inKey).join(','); 871 commonlyInkeys = data.arr.map(item => item.inKey).join(',');
925 inkeys.val(commonlyInkeys); 872 inkeys.val(commonlyInkeys);
926 - // if(data && data.isAdd) {  
927 - // commonlyvalue.remove();  
928 - // inkeys.show();  
929 - // }  
930 return commonlyInkeys 873 return commonlyInkeys
931 } 874 }
932 }); 875 });
933 - }  
934 - });  
935 }) 876 })
936 } 877 }
937 } 878 }
@@ -940,41 +881,41 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -940,41 +881,41 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
940 //告警规则类型切换事件 881 //告警规则类型切换事件
941 form.on('radio(alarm-policy-rule-type)', function (data) { 882 form.on('radio(alarm-policy-rule-type)', function (data) {
942 var flag = $(data.elem).data("flag"); 883 var flag = $(data.elem).data("flag");
943 - if(data.value == '1'){ 884 + if (data.value == '1') {
944 $(`.${flag}-tab-item`).find("div.cont-base").show(); 885 $(`.${flag}-tab-item`).find("div.cont-base").show();
945 - }else{ 886 + } else {
946 $(`.${flag}-tab-item`).find("div.cont-base").hide(); 887 $(`.${flag}-tab-item`).find("div.cont-base").hide();
947 $(`#${flag}Policy`).val(''); 888 $(`#${flag}Policy`).val('');
948 } 889 }
949 }); 890 });
950 //选择指标 891 //选择指标
951 - $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click",function (){  
952 - common.openWin("template/res/reskpilist","选择指标", {resType:null},["选择","取消"], function () { 892 + $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click", function () {
  893 + common.openWin("template/res/reskpilist", "选择指标", {resType: null}, ["选择", "取消"], function () {
953 var data = layui.reskpilist().getData(); 894 var data = layui.reskpilist().getData();
954 - if(data && data.length != 1){  
955 - layer.msg('只能选择一个指标！', {icon: 7,time:3000}); 895 + if (data && data.length != 1) {
  896 + layer.msg('只能选择一个指标！', {icon: 7, time: 3000});
956 return false; 897 return false;
957 } 898 }
958 - if(data && data.length > 0){ 899 + if (data && data.length > 0) {
959 $("#alarm-policy-kpiId").val(data[0].kpiId); 900 $("#alarm-policy-kpiId").val(data[0].kpiId);
960 $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName); 901 $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName);
961 $("#alarmPolicyName").val(data[0].kpiName + "告警策略"); 902 $("#alarmPolicyName").val(data[0].kpiName + "告警策略");
962 $("#serious_policy_param_val").val(data[0].kpiId); 903 $("#serious_policy_param_val").val(data[0].kpiId);
963 $("#important_policy_param_val").val(data[0].kpiId); 904 $("#important_policy_param_val").val(data[0].kpiId);
964 $("#commonly_policy_param_val").val(data[0].kpiId); 905 $("#commonly_policy_param_val").val(data[0].kpiId);
965 - var arry = [ "base", "cpu", "mem"]; 906 + var arry = ["base", "cpu", "mem"];
966 return true; 907 return true;
967 } 908 }
968 }); 909 });
969 }); 910 });
970 911
971 //增加一行策略表达式输入框 912 //增加一行策略表达式输入框
972 - $("i.policy-input-add").off("click").on("click",function (){ 913 + $("i.policy-input-add").off("click").on("click", function () {
973 var id = $(this).data("id"); 914 var id = $(this).data("id");
974 clonePolicyDoms(id); 915 clonePolicyDoms(id);
975 }); 916 });
976 //删除告警策略规则行 917 //删除告警策略规则行
977 - $("i.policy-input-del").on("click",function (){ 918 + $("i.policy-input-del").on("click", function () {
978 var id = $(this).data("id"); 919 var id = $(this).data("id");
979 $(`#${id}`).remove(); 920 $(`#${id}`).remove();
980 }); 921 });
@@ -983,9 +924,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -983,9 +924,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
983 var importantpolicyItems = []; 924 var importantpolicyItems = [];
984 var commonlypolicyItems = []; 925 var commonlypolicyItems = [];
985 //生成策略 926 //生成策略
986 - $("a.createpolicybtn").on("click",function (){ 927 + $("a.createpolicybtn").on("click", function () {
987 var kpiId = $("#alarm-policy-kpiId").val(); 928 var kpiId = $("#alarm-policy-kpiId").val();
988 - if(!kpiId){ 929 + if (!kpiId) {
989 layer.msg("请先选择指标！", { 930 layer.msg("请先选择指标！", {
990 icon: 7 931 icon: 7
991 , time: 3000 932 , time: 3000
@@ -993,23 +934,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -993,23 +934,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
993 return false; 934 return false;
994 } 935 }
995 var policyFlag = $(this).data("flag"); 936 var policyFlag = $(this).data("flag");
996 - var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"!=","6":"equals","7":"!,equals","8":"contains","9":"startsWith","10":"endsWith","11":"!,contains"}; 937 + var conOjb = {
  938 + "0": ">",
  939 + "1": "<",
  940 + "2": "=",
  941 + "3": ">=",
  942 + "4": "<=",
  943 + "5": "!=",
  944 + "6": "equals",
  945 + "7": "!,equals",
  946 + "8": "contains",
  947 + "9": "startsWith",
  948 + "10": "endsWith",
  949 + "11": "!,contains"
  950 + };
997 var doms = $(`[id^=${policyFlag}-policy-box]`); 951 var doms = $(`[id^=${policyFlag}-policy-box]`);
998 var policyStr = ''; 952 var policyStr = '';
999 - var relationobj = {"1": 0,"3":1,"5":2,"7":3,"9":4,"11":5,"13":6,"15":7,"17":8,"19":9,"21":10}  
1000 - if(policyFlag.indexOf("serious")!=-1) { 953 + var relationobj = {
  954 + "1": 0,
  955 + "3": 1,
  956 + "5": 2,
  957 + "7": 3,
  958 + "9": 4,
  959 + "11": 5,
  960 + "13": 6,
  961 + "15": 7,
  962 + "17": 8,
  963 + "19": 9,
  964 + "21": 10
  965 + }
  966 + if (policyFlag.indexOf("serious") != -1) {
1001 seriouspolicyItems = []; 967 seriouspolicyItems = [];
1002 $(doms).each(function (i, v) { 968 $(doms).each(function (i, v) {
1003 var domId = $(v).attr("id"); 969 var domId = $(v).attr("id");
1004 if (domId.indexOf("condition") != -1) {//条件 970 if (domId.indexOf("condition") != -1) {//条件
1005 - var j = relationobj[''+i+'']; 971 + var j = relationobj['' + i + ''];
1006 var open = $(v).find('input[type=radio].condition:checked').val(); 972 var open = $(v).find('input[type=radio].condition:checked').val();
1007 if (open == "||") { 973 if (open == "||") {
1008 policyStr += open; 974 policyStr += open;
1009 - seriouspolicyItems[j].relationSymbol= "1"; 975 + seriouspolicyItems[j].relationSymbol = "1";
1010 } else { 976 } else {
1011 policyStr += open; 977 policyStr += open;
1012 - seriouspolicyItems[j].relationSymbol= "0"; 978 + seriouspolicyItems[j].relationSymbol = "0";
1013 } 979 }
1014 } else { //值 980 } else { //值
1015 var conditon = $(v).find(".condition").val(); 981 var conditon = $(v).find(".condition").val();
@@ -1020,50 +986,50 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1020,50 +986,50 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1020 if (conval && param) { 986 if (conval && param) {
1021 if (param == "current_kpi") { 987 if (param == "current_kpi") {
1022 var itemObj = { 988 var itemObj = {
1023 - "confNo":kpiId,  
1024 - "kpiId" :kpiId,  
1025 - "type":param,  
1026 - "operatorSymbol":conditon,  
1027 - 'operatorValue':conval, 989 + "confNo": kpiId,
  990 + "kpiId": kpiId,
  991 + "type": param,
  992 + "operatorSymbol": conditon,
  993 + 'operatorValue': conval,
1028 "relationSymbol": '', 994 "relationSymbol": '',
1029 "isTermOver": 0, 995 "isTermOver": 0,
1030 "sort": 0, 996 "sort": 0,
1031 - "policyFlag":policyFlag 997 + "policyFlag": policyFlag
1032 } 998 }
1033 seriouspolicyItems.push(itemObj); 999 seriouspolicyItems.push(itemObj);
1034 if (conditon <= 5) { //数字类的 1000 if (conditon <= 5) { //数字类的
1035 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 1001 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
1036 - } else if(conditon == 7) { //字符串类的 1002 + } else if (conditon == 7) { //字符串类的
1037 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 1003 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
1038 - } else if(conditon == 8) { //字符串类的 1004 + } else if (conditon == 8) { //字符串类的
1039 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`; 1005 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
1040 - } else if(conditon == 11) { //字符串类的 1006 + } else if (conditon == 11) { //字符串类的
1041 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`; 1007 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
1042 - }else { 1008 + } else {
1043 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 1009 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
1044 1010
1045 } 1011 }
1046 } else { 1012 } else {
1047 var itemObj = { 1013 var itemObj = {
1048 - "confNo":param,  
1049 - "kpiId" :kpiId,  
1050 - "type":param,  
1051 - "operatorSymbol":conditon,  
1052 - 'operatorValue':conval, 1014 + "confNo": param,
  1015 + "kpiId": kpiId,
  1016 + "type": param,
  1017 + "operatorSymbol": conditon,
  1018 + 'operatorValue': conval,
1053 "relationSymbol": '', 1019 "relationSymbol": '',
1054 "isTermOver": 0, 1020 "isTermOver": 0,
1055 - "sort": i-1,  
1056 - "policyFlag":policyFlag 1021 + "sort": i - 1,
  1022 + "policyFlag": policyFlag
1057 } 1023 }
1058 seriouspolicyItems.push(itemObj); 1024 seriouspolicyItems.push(itemObj);
1059 if (conditon <= 5) { 1025 if (conditon <= 5) {
1060 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 1026 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
1061 - } else if(conditon == 7) { //字符串类的 1027 + } else if (conditon == 7) { //字符串类的
1062 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 1028 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
1063 - }else if(conditon == 8){ 1029 + } else if (conditon == 8) {
1064 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1030 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1065 1031
1066 - }else if(conditon == 11){ 1032 + } else if (conditon == 11) {
1067 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1033 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1068 1034
1069 } else { 1035 } else {
@@ -1074,19 +1040,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1074,19 +1040,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1074 } 1040 }
1075 } 1041 }
1076 }); 1042 });
1077 - }else if(policyFlag.indexOf("important")!=-1){ 1043 + } else if (policyFlag.indexOf("important") != -1) {
1078 importantpolicyItems = []; 1044 importantpolicyItems = [];
1079 $(doms).each(function (i, v) { 1045 $(doms).each(function (i, v) {
1080 var domId = $(v).attr("id"); 1046 var domId = $(v).attr("id");
1081 if (domId.indexOf("condition") != -1) {//条件 1047 if (domId.indexOf("condition") != -1) {//条件
1082 - var j = relationobj[''+i+'']; 1048 + var j = relationobj['' + i + ''];
1083 var open = $(v).find('input[type=radio].condition:checked').val(); 1049 var open = $(v).find('input[type=radio].condition:checked').val();
1084 if (open == "||") { 1050 if (open == "||") {
1085 policyStr += open; 1051 policyStr += open;
1086 - importantpolicyItems[j].relationSymbol= "1"; 1052 + importantpolicyItems[j].relationSymbol = "1";
1087 } else { 1053 } else {
1088 policyStr += open; 1054 policyStr += open;
1089 - importantpolicyItems[j].relationSymbol= "0"; 1055 + importantpolicyItems[j].relationSymbol = "0";
1090 } 1056 }
1091 } else { //值 1057 } else { //值
1092 var conditon = $(v).find(".condition").val(); 1058 var conditon = $(v).find(".condition").val();
@@ -1097,49 +1063,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1097,49 +1063,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1097 if (conval && param) { 1063 if (conval && param) {
1098 if (param == "current_kpi") { 1064 if (param == "current_kpi") {
1099 var itemObj = { 1065 var itemObj = {
1100 - "confNo":kpiId,  
1101 - "kpiId" :kpiId,  
1102 - "type":param, 1066 + "confNo": kpiId,
  1067 + "kpiId": kpiId,
  1068 + "type": param,
1103 "operatorSymbol": conditon, 1069 "operatorSymbol": conditon,
1104 'operatorValue': conval, 1070 'operatorValue': conval,
1105 "relationSymbol": '', 1071 "relationSymbol": '',
1106 "isTermOver": 0, 1072 "isTermOver": 0,
1107 "sort": 0, 1073 "sort": 0,
1108 - "policyFlag":policyFlag 1074 + "policyFlag": policyFlag
1109 } 1075 }
1110 importantpolicyItems.push(itemObj); 1076 importantpolicyItems.push(itemObj);
1111 if (conditon <= 5) { //数字类的 1077 if (conditon <= 5) { //数字类的
1112 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 1078 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
1113 - } else if(conditon == 7) { //字符串类的 1079 + } else if (conditon == 7) { //字符串类的
1114 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 1080 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
1115 - } else if(conditon == 8) { //字符串类的 1081 + } else if (conditon == 8) { //字符串类的
1116 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`; 1082 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
1117 - } else if(conditon == 11) { //字符串类的 1083 + } else if (conditon == 11) { //字符串类的
1118 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`; 1084 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
1119 - }else { //字符串类的 1085 + } else { //字符串类的
1120 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 1086 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
1121 } 1087 }
1122 } else { 1088 } else {
1123 var itemObj = { 1089 var itemObj = {
1124 - "confNo":param,  
1125 - "kpiId" :kpiId,  
1126 - "type":param, 1090 + "confNo": param,
  1091 + "kpiId": kpiId,
  1092 + "type": param,
1127 "operatorSymbol": conditon, 1093 "operatorSymbol": conditon,
1128 'operatorValue': conval, 1094 'operatorValue': conval,
1129 "relationSymbol": '', 1095 "relationSymbol": '',
1130 "isTermOver": 0, 1096 "isTermOver": 0,
1131 - "sort": i-1,  
1132 - "policyFlag":policyFlag 1097 + "sort": i - 1,
  1098 + "policyFlag": policyFlag
1133 } 1099 }
1134 importantpolicyItems.push(itemObj); 1100 importantpolicyItems.push(itemObj);
1135 if (conditon <= 5) { 1101 if (conditon <= 5) {
1136 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 1102 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
1137 - }else if(conditon == 7) { //字符串类的 1103 + } else if (conditon == 7) { //字符串类的
1138 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 1104 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
1139 - }else if(conditon == 8){ 1105 + } else if (conditon == 8) {
1140 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1106 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1141 1107
1142 - }else if(conditon == 11){ 1108 + } else if (conditon == 11) {
1143 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1109 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1144 1110
1145 } else { 1111 } else {
@@ -1151,19 +1117,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1151,19 +1117,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1151 } 1117 }
1152 }); 1118 });
1153 1119
1154 - }else if(policyFlag.indexOf("commonly")!=-1){ 1120 + } else if (policyFlag.indexOf("commonly") != -1) {
1155 commonlypolicyItems = []; 1121 commonlypolicyItems = [];
1156 $(doms).each(function (i, v) { 1122 $(doms).each(function (i, v) {
1157 var domId = $(v).attr("id"); 1123 var domId = $(v).attr("id");
1158 if (domId.indexOf("condition") != -1) {//条件 1124 if (domId.indexOf("condition") != -1) {//条件
1159 - var j = relationobj[''+i+'']; 1125 + var j = relationobj['' + i + ''];
1160 var open = $(v).find('input[type=radio].condition:checked').val(); 1126 var open = $(v).find('input[type=radio].condition:checked').val();
1161 if (open == "||") { 1127 if (open == "||") {
1162 policyStr += open; 1128 policyStr += open;
1163 - commonlypolicyItems[j].relationSymbol= "1"; 1129 + commonlypolicyItems[j].relationSymbol = "1";
1164 } else { 1130 } else {
1165 policyStr += open; 1131 policyStr += open;
1166 - commonlypolicyItems[j].relationSymbol= "0"; 1132 + commonlypolicyItems[j].relationSymbol = "0";
1167 } 1133 }
1168 } else { //值 1134 } else { //值
1169 var conditon = $(v).find(".condition").val(); 1135 var conditon = $(v).find(".condition").val();
@@ -1174,49 +1140,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1174,49 +1140,49 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1174 if (conval && param) { 1140 if (conval && param) {
1175 if (param == "current_kpi") { 1141 if (param == "current_kpi") {
1176 var itemObj = { 1142 var itemObj = {
1177 - "confNo":kpiId,  
1178 - "kpiId" :kpiId,  
1179 - "type":param,  
1180 - "operatorSymbol":conditon,  
1181 - 'operatorValue':conval, 1143 + "confNo": kpiId,
  1144 + "kpiId": kpiId,
  1145 + "type": param,
  1146 + "operatorSymbol": conditon,
  1147 + 'operatorValue': conval,
1182 "relationSymbol": '', 1148 "relationSymbol": '',
1183 "isTermOver": 0, 1149 "isTermOver": 0,
1184 "sort": 0, 1150 "sort": 0,
1185 - "policyFlag":policyFlag 1151 + "policyFlag": policyFlag
1186 } 1152 }
1187 commonlypolicyItems.push(itemObj); 1153 commonlypolicyItems.push(itemObj);
1188 if (conditon <= 5) { //数字类的 1154 if (conditon <= 5) { //数字类的
1189 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 1155 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
1190 - }else if(conditon == 7) { //字符串类的 1156 + } else if (conditon == 7) { //字符串类的
1191 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 1157 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
1192 - } else if(conditon == 8) { //字符串类的 1158 + } else if (conditon == 8) { //字符串类的
1193 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`; 1159 policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
1194 - } else if(conditon == 11) { //字符串类的 1160 + } else if (conditon == 11) { //字符串类的
1195 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`; 1161 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
1196 - }else { //字符串类的 1162 + } else { //字符串类的
1197 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 1163 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
1198 } 1164 }
1199 } else { 1165 } else {
1200 var itemObj = { 1166 var itemObj = {
1201 - "confNo":param,  
1202 - "kpiId" :kpiId,  
1203 - "type":param,  
1204 - "operatorSymbol":conditon, 1167 + "confNo": param,
  1168 + "kpiId": kpiId,
  1169 + "type": param,
  1170 + "operatorSymbol": conditon,
1205 'operatorValue': conval, 1171 'operatorValue': conval,
1206 "relationSymbol": '', 1172 "relationSymbol": '',
1207 "isTermOver": 0, 1173 "isTermOver": 0,
1208 - "sort": i-1,  
1209 - "policyFlag":policyFlag 1174 + "sort": i - 1,
  1175 + "policyFlag": policyFlag
1210 } 1176 }
1211 commonlypolicyItems.push(itemObj); 1177 commonlypolicyItems.push(itemObj);
1212 if (conditon <= 5) { 1178 if (conditon <= 5) {
1213 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 1179 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
1214 - }else if(conditon == 7) { //字符串类的 1180 + } else if (conditon == 7) { //字符串类的
1215 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 1181 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
1216 - }else if(conditon == 8){ 1182 + } else if (conditon == 8) {
1217 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1183 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1218 1184
1219 - }else if(conditon == 11){ 1185 + } else if (conditon == 11) {
1220 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1186 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1221 1187
1222 } else { 1188 } else {
@@ -1228,9 +1194,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1228,9 +1194,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1228 } 1194 }
1229 }); 1195 });
1230 } 1196 }
1231 - if(policyStr){ 1197 + if (policyStr) {
1232 $(`#${policyFlag}Policy`).val(policyStr); 1198 $(`#${policyFlag}Policy`).val(policyStr);
1233 - }else{ 1199 + } else {
1234 layer.msg("请先输入策略值！", { 1200 layer.msg("请先输入策略值！", {
1235 icon: 7 1201 icon: 7
1236 , time: 3000 1202 , time: 3000
@@ -1240,7 +1206,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1240,7 +1206,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1240 }); 1206 });
1241 1207
1242 //保存策略 1208 //保存策略
1243 - $("#alarmpolicy-form-save-id").on("click",function (){ 1209 + $("#alarmpolicy-form-save-id").on("click", function () {
1244 var data = form.val("add-alarmpolicy-form"); 1210 var data = form.val("add-alarmpolicy-form");
1245 //移除非数进性的属性 1211 //移除非数进性的属性
1246 delete data['serious-policy-type']; 1212 delete data['serious-policy-type'];
@@ -1259,45 +1225,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1259,45 +1225,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1259 charToExpr(data, 'importantExpr'); 1225 charToExpr(data, 'importantExpr');
1260 charToExpr(data, 'seriousExpr'); 1226 charToExpr(data, 'seriousExpr');
1261 var params = {}; 1227 var params = {};
1262 - var policyConfigObj ={} 1228 + var policyConfigObj = {}
1263 policyConfigObj.seriousPolicyDesc = data["seriousPolicy"]; 1229 policyConfigObj.seriousPolicyDesc = data["seriousPolicy"];
1264 policyConfigObj.importantPolicyDesc = data["importantPolicy"]; 1230 policyConfigObj.importantPolicyDesc = data["importantPolicy"];
1265 policyConfigObj.commonlyPolicyDesc = data["commonlyPolicy"]; 1231 policyConfigObj.commonlyPolicyDesc = data["commonlyPolicy"];
1266 - if(seriouspolicyItems.length>0) { 1232 + if (seriouspolicyItems.length > 0) {
1267 for (let i = 0; i < seriouspolicyItems.length; i++) { 1233 for (let i = 0; i < seriouspolicyItems.length; i++) {
1268 policyConfigItems.push(seriouspolicyItems[i]); 1234 policyConfigItems.push(seriouspolicyItems[i]);
1269 } 1235 }
1270 } 1236 }
1271 - if(importantpolicyItems.length>0){ 1237 + if (importantpolicyItems.length > 0) {
1272 for (let i = 0; i < importantpolicyItems.length; i++) { 1238 for (let i = 0; i < importantpolicyItems.length; i++) {
1273 policyConfigItems.push(importantpolicyItems[i]); 1239 policyConfigItems.push(importantpolicyItems[i]);
1274 } 1240 }
1275 } 1241 }
1276 - if(commonlypolicyItems.length>0){ 1242 + if (commonlypolicyItems.length > 0) {
1277 for (let i = 0; i < commonlypolicyItems.length; i++) { 1243 for (let i = 0; i < commonlypolicyItems.length; i++) {
1278 policyConfigItems.push(commonlypolicyItems[i]); 1244 policyConfigItems.push(commonlypolicyItems[i]);
1279 } 1245 }
1280 } 1246 }
1281 params.data = JSON.stringify(data); 1247 params.data = JSON.stringify(data);
1282 - params.policyConfigObj =JSON.stringify(policyConfigObj); 1248 + params.policyConfigObj = JSON.stringify(policyConfigObj);
1283 params.policyConfigItems = policyConfigItems; 1249 params.policyConfigItems = policyConfigItems;
1284 - form.on('submit(add-alarmpolicy-form)',function () { 1250 + form.on('submit(add-alarmpolicy-form)', function () {
1285 admin.req({ 1251 admin.req({
1286 - url : domainName + '/api-web/alarmPolicy/save?access_token='+accessToken  
1287 - ,data:JSON.stringify(params)  
1288 - ,type:'post'  
1289 - ,contentType: "application/json; charset=utf-8"  
1290 - ,done:function (res){  
1291 - if(res.success){  
1292 - localStorage.setItem("detailPageOfcustomPolicyId",res.str)  
1293 - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ 1252 + url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken
  1253 + , data: JSON.stringify(params)
  1254 + , type: 'post'
  1255 + , contentType: "application/json; charset=utf-8"
  1256 + , done: function (res) {
  1257 + if (res.success) {
  1258 + localStorage.setItem("detailPageOfcustomPolicyId", res.str)
  1259 + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
1294 localStorage.removeItem("currentResType"); 1260 localStorage.removeItem("currentResType");
1295 // if(layui.alarmpolicyIndex && layui.alarmpolicyIndex()){ 1261 // if(layui.alarmpolicyIndex && layui.alarmpolicyIndex()){
1296 // layui.alarmpolicyIndex().reloadAlarmPolicy() 1262 // layui.alarmpolicyIndex().reloadAlarmPolicy()
1297 // } 1263 // }
1298 }); 1264 });
1299 - }else{  
1300 - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); 1265 + } else {
  1266 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
1301 } 1267 }
1302 } 1268 }
1303 }); 1269 });
@@ -1307,50 +1273,42 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1307,50 +1273,42 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1307 }); 1273 });
1308 1274
1309 //克隆告警策略元素 1275 //克隆告警策略元素
1310 - function clonePolicyDoms(id){ 1276 + function clonePolicyDoms(id) {
1311 var times = new Date().getTime() 1277 var times = new Date().getTime()
1312 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition"> 1278 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition">
1313 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" > 1279 <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
1314 </div>`; 1280 </div>`;
1315 var clone = $(`#${id}`).clone(); 1281 var clone = $(`#${id}`).clone();
1316 - clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide")  
1317 - .parent().parent().find("i.policy-input-del").attr("data-id",id + "-"+times).removeClass("hide") 1282 + clone.attr("id", id + "-" + times).find("i.policy-input-add").addClass("hide")
  1283 + .parent().parent().find("i.policy-input-del").attr("data-id", id + "-" + times).removeClass("hide")
1318 .parent().parent().find("div.paramval").addClass("hide") 1284 .parent().parent().find("div.paramval").addClass("hide")
1319 .parent().parent().find("input.layui-input").val(""); 1285 .parent().parent().find("input.layui-input").val("");
1320 //console.log(clone.find("select.policyparam").html(options)) 1286 //console.log(clone.find("select.policyparam").html(options))
1321 clone.find("select.policyparam").html(options); 1287 clone.find("select.policyparam").html(options);
1322 clone.find("select.condition").html(conditionoptions); 1288 clone.find("select.condition").html(conditionoptions);
1323 - clone.find("input[type=tel]").attr("style","width:480px").val('');  
1324 - clone.find("input[type=tel]").parent().attr("style","width:490px"); 1289 + clone.find("input[type=tel]").attr("style", "width:480px").val('');
  1290 + clone.find("input[type=tel]").parent().attr("style", "width:490px");
1325 //获取最后一个添加的id 1291 //获取最后一个添加的id
1326 var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`); 1292 var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`);
1327 - var lastid ='';  
1328 - if($(doms)&&$(doms).length>0) { 1293 + var lastid = '';
  1294 + if ($(doms) && $(doms).length > 0) {
1329 $(doms).each(function (i, v) { 1295 $(doms).each(function (i, v) {
1330 var $domId = $(v).attr("id"); 1296 var $domId = $(v).attr("id");
1331 - var trimdomid = $domId.substring(0,$domId.length-10) 1297 + var trimdomid = $domId.substring(0, $domId.length - 10)
1332 if (trimdomid > lastid) { 1298 if (trimdomid > lastid) {
1333 lastid = trimdomid; 1299 lastid = trimdomid;
1334 } 1300 }
1335 }); 1301 });
1336 - }else { 1302 + } else {
1337 lastid = id; 1303 lastid = id;
1338 } 1304 }
1339 $(`#${lastid}`).after(clone).after(cond); 1305 $(`#${lastid}`).after(clone).after(cond);
1340 - clone.find("input[type=tel]").before('<div id="devTypevalue-'+times+'" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');  
1341 - var dev_type= $(this).closest(".cont-base").find("input[type=tel]");  
1342 - clone.find("input[type=tel]").unbind('click').on("click",function () {  
1343 - $.ajax({  
1344 - url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken,  
1345 - method:"get",  
1346 - success(res){  
1347 - if (res.code==200)  
1348 - // 资源类型下拉框  
1349 - var data = res.data;  
1350 - let option = handleTree(res.data, 'id', 'pId','children','name'); 1306 + clone.find("input[type=tel]").before('<div id="devTypevalue-' + times + '" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
  1307 + var dev_type = $(this).closest(".cont-base").find("input[type=tel]");
  1308 + clone.find("input[type=tel]").unbind('click').on("click", function () {
1351 xmSelect.render({ 1309 xmSelect.render({
1352 - el: '#devTypevalue-'+times,  
1353 - name:'devType', 1310 + el: '#devTypevalue-' + times,
  1311 + name: 'devType',
1354 tips: '=设备类型=', 1312 tips: '=设备类型=',
1355 radio: false, 1313 radio: false,
1356 clickClose: false, 1314 clickClose: false,
@@ -1380,24 +1338,22 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1380,24 +1338,22 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1380 //是否严格遵守父子模式 1338 //是否严格遵守父子模式
1381 strict: true 1339 strict: true
1382 }, 1340 },
1383 - data:option, 1341 + data: devTypeOption,
1384 on: function (data) { 1342 on: function (data) {
1385 let resTypes = data.arr.map(item => item.id).join(','); 1343 let resTypes = data.arr.map(item => item.id).join(',');
1386 dev_type.val(resTypes); 1344 dev_type.val(resTypes);
1387 return resTypes; 1345 return resTypes;
1388 } 1346 }
1389 }); 1347 });
1390 - return data;  
1391 - }  
1392 - }); 1348 +
1393 }); 1349 });
1394 form.render(); 1350 form.render();
1395 //渲染新增事件 1351 //渲染新增事件
1396 - $("i.policy-input-add").off("click").on("click",function (){ 1352 + $("i.policy-input-add").off("click").on("click", function () {
1397 clonePolicyDoms($(this).data("id")); 1353 clonePolicyDoms($(this).data("id"));
1398 }); 1354 });
1399 //删除告警策略规则行 1355 //删除告警策略规则行
1400 - $("i.policy-input-del").off("click").on("click",function (){ 1356 + $("i.policy-input-del").off("click").on("click", function () {
1401 var id = $(this).data("id"); 1357 var id = $(this).data("id");
1402 $(`#${id}`).remove(); 1358 $(`#${id}`).remove();
1403 $(`#${id}-condition`).remove(); 1359 $(`#${id}-condition`).remove();
@@ -1428,7 +1384,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -1428,7 +1384,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
1428 //如果是详情页过来的，则不能改变指标和默认状态 1384 //如果是详情页过来的，则不能改变指标和默认状态
1429 if (data && data.from === 'detail') { 1385 if (data && data.from === 'detail') {
1430 $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click'); 1386 $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click');
1431 - $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled","disabled"); 1387 + $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled", "disabled");
1432 } 1388 }
1433 }); 1389 });
1434 }); 1390 });