monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 高磊
Commit 948a1b18275903a112b7b66c8e65e6045fc03a29 2 parents ea29deb9 be1fb531

Merge branch 'master-500-log-ztq' into 'master-500-log' 

Master 500 log ztq



See merge request !1020
Inline Side-by-side
Showing 3 changed files with 43 additions and 4 deletions
@@ -12,6 +12,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -12,6 +12,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
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 accessToken2 = "3d6c458e-9fff-434e-987d-29380cbd8455";
15 var seriousInkeySelect; 16 var seriousInkeySelect;
16 var options = ''; 17 var options = '';
17 var defaultoptions = ''; 18 var defaultoptions = '';
@@ -281,6 +282,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -281,6 +282,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
281 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name); 282 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name);
282 } 283 }
283 initpolicyParam(); 284 initpolicyParam();
  285 + // debugger
284 286
285 function initpolicyParam() { 287 function initpolicyParam() {
286 $.ajax({ 288 $.ajax({
@@ -970,6 +972,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -970,6 +972,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
970 var seriouspolicyItems = []; 972 var seriouspolicyItems = [];
971 var importantpolicyItems = []; 973 var importantpolicyItems = [];
972 var commonlypolicyItems = []; 974 var commonlypolicyItems = [];
  975 + let serious_type;
  976 + let important_type;
  977 + let commonly_type;
973 //生成策略 978 //生成策略
974 $("a.createpolicybtn").on("click", function () { 979 $("a.createpolicybtn").on("click", function () {
975 var kpiId = $("#alarm-policy-kpiId").val(); 980 var kpiId = $("#alarm-policy-kpiId").val();
@@ -996,6 +1001,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -996,6 +1001,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
996 "11": "!,contains" 1001 "11": "!,contains"
997 }; 1002 };
998 var doms = $(`[id^=${policyFlag}-policy-box]`); 1003 var doms = $(`[id^=${policyFlag}-policy-box]`);
  1004 + // console.log(doms);
999 var policyStr = ''; 1005 var policyStr = '';
1000 var relationobj = { 1006 var relationobj = {
1001 "1": 0, 1007 "1": 0,
@@ -1026,10 +1032,13 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1026,10 +1032,13 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1026 } 1032 }
1027 } else { //值 1033 } else { //值
1028 var conditon = $(v).find(".condition").val(); 1034 var conditon = $(v).find(".condition").val();
  1035 + // console.log(conditon);
1029 var cls = policyFlag + "_value"; 1036 var cls = policyFlag + "_value";
1030 var paramflag = policyFlag + "_policy_param" 1037 var paramflag = policyFlag + "_policy_param"
1031 var conval = $(v).find('[flag="' + cls + '"]').val().trim(); 1038 var conval = $(v).find('[flag="' + cls + '"]').val().trim();
1032 var param = $(v).find('[name="' + paramflag + '"]').val().trim(); 1039 var param = $(v).find('[name="' + paramflag + '"]').val().trim();
  1040 + // console.log(conval);
  1041 + // console.log(param);
1033 if (conval && param) { 1042 if (conval && param) {
1034 if (param == "current_kpi") { 1043 if (param == "current_kpi") {
1035 var itemObj = { 1044 var itemObj = {
@@ -1049,9 +1058,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1049,9 +1058,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1049 } else if (conditon == 7) { //字符串类的 1058 } else if (conditon == 7) { //字符串类的
1050 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 1059 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
1051 } else if (conditon == 8) { //字符串类的 1060 } else if (conditon == 8) { //字符串类的
1052 - policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`; 1061 + policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
1053 } else if (conditon == 11) { //字符串类的 1062 } else if (conditon == 11) { //字符串类的
1054 - policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`; 1063 + policyStr += `[${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}!("${conval}")`;
1055 } else { 1064 } else {
1056 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 1065 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
1057 1066
@@ -1075,16 +1084,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1075,16 +1084,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1075 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 1084 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
1076 } else */ 1085 } else */
1077 if (conditon == 8) { 1086 if (conditon == 8) {
  1087 + serious_type = true;
1078 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1088 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1079 1089
1080 } else if (conditon == 11) { 1090 } else if (conditon == 11) {
  1091 + serious_type = true;
1081 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1092 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1082 1093
1083 } else { 1094 } else {
1084 if(conval.includes(",")){ 1095 if(conval.includes(",")){
  1096 + serious_type = false;
1085 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000}) 1097 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000})
1086 return false; 1098 return false;
1087 }else { 1099 }else {
  1100 + serious_type = true;
1088 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 1101 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
1089 } 1102 }
1090 } 1103 }
@@ -1113,6 +1126,8 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1113,6 +1126,8 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1113 var paramflag = policyFlag + "_policy_param" 1126 var paramflag = policyFlag + "_policy_param"
1114 var conval = $(v).find('[flag="' + cls + '"]').val().trim(); 1127 var conval = $(v).find('[flag="' + cls + '"]').val().trim();
1115 var param = $(v).find('[name="' + paramflag + '"]').val().trim(); 1128 var param = $(v).find('[name="' + paramflag + '"]').val().trim();
  1129 + // console.log(conval);
  1130 + // console.log(param);
1116 if (conval && param) { 1131 if (conval && param) {
1117 if (param == "current_kpi") { 1132 if (param == "current_kpi") {
1118 var itemObj = { 1133 var itemObj = {
@@ -1152,16 +1167,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1152,16 +1167,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1152 } 1167 }
1153 importantpolicyItems.push(itemObj); 1168 importantpolicyItems.push(itemObj);
1154 if (conditon == 8) { 1169 if (conditon == 8) {
  1170 + important_type=true;
1155 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1171 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1156 1172
1157 } else if (conditon == 11) { 1173 } else if (conditon == 11) {
  1174 + important_type=true;
1158 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1175 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1159 1176
1160 } else { 1177 } else {
1161 if(conval.includes(",")){ 1178 if(conval.includes(",")){
  1179 + important_type=false;
1162 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000}) 1180 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000})
1163 return false; 1181 return false;
1164 }else { 1182 }else {
  1183 + important_type=true;
1165 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 1184 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
1166 } 1185 }
1167 } 1186 }
@@ -1230,16 +1249,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1230,16 +1249,20 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1230 } 1249 }
1231 commonlypolicyItems.push(itemObj); 1250 commonlypolicyItems.push(itemObj);
1232 if (conditon == 8) { 1251 if (conditon == 8) {
  1252 + commonly_type = true;
1233 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`; 1253 policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
1234 1254
1235 } else if (conditon == 11) { 1255 } else if (conditon == 11) {
  1256 + commonly_type = true;
1236 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`; 1257 policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
1237 1258
1238 } else { 1259 } else {
1239 if(conval.includes(",")){ 1260 if(conval.includes(",")){
  1261 + commonly_type = false;
1240 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000}); 1262 layer.msg("不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000});
1241 return false; 1263 return false;
1242 }else { 1264 }else {
  1265 + commonly_type = true;
1243 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 1266 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
1244 } 1267 }
1245 } 1268 }
@@ -1262,6 +1285,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1262,6 +1285,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1262 1285
1263 //保存策略 1286 //保存策略
1264 $("#alarmpolicy-form-save-id").on("click", function () { 1287 $("#alarmpolicy-form-save-id").on("click", function () {
  1288 + policyConfigItems=[];
1265 var data = form.val("add-alarmpolicy-form"); 1289 var data = form.val("add-alarmpolicy-form");
1266 //移除非数进性的属性 1290 //移除非数进性的属性
1267 delete data['serious-policy-type']; 1291 delete data['serious-policy-type'];
@@ -1302,6 +1326,21 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -1302,6 +1326,21 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
1302 params.data = JSON.stringify(data); 1326 params.data = JSON.stringify(data);
1303 params.policyConfigObj = JSON.stringify(policyConfigObj); 1327 params.policyConfigObj = JSON.stringify(policyConfigObj);
1304 params.policyConfigItems = policyConfigItems; 1328 params.policyConfigItems = policyConfigItems;
  1329 + // console.log(policyConfigItems ,data,policyConfigObj);
  1330 + // return false;
  1331 + for (let i=0;i<policyConfigItems.length;i++){
  1332 + // console.log(policyConfigItems[i].type,'-----------------'+policyConfigItems[i].operatorSymbol,'----------------'+policyConfigItems[i].operatorValue.includes(','));
  1333 + if (policyConfigItems[i].type != "current_kpi" && policyConfigItems[i].operatorSymbol=='6'&&policyConfigItems[i].operatorValue.includes(',')){
  1334 + if (policyConfigItems[i].policyFlag == "serious"){
  1335 + layer.msg("严重告警策略，数据不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000})
  1336 + }else if (policyConfigItems[i].policyFlag == "important"){
  1337 + layer.msg("重要告警策略，数据不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000})
  1338 + }else if (policyConfigItems[i].policyFlag == "commonly"){
  1339 + layer.msg("一般告警策略，数据不能等于多个值,请单选", {offset: '15px', icon: 7, time: 2000})
  1340 + }
  1341 + return false;
  1342 + }
  1343 + }
1305 form.on('submit(add-alarmpolicy-form)', function () { 1344 form.on('submit(add-alarmpolicy-form)', function () {
1306 admin.req({ 1345 admin.req({
1307 url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken 1346 url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken
@@ -381,7 +381,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -381,7 +381,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
381 title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`; 381 title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`;
382 common.openWin('baseconfig/alarmpolicy/add',title, {id:id},['保存','取消'],function () { 382 common.openWin('baseconfig/alarmpolicy/add',title, {id:id},['保存','取消'],function () {
383 $("#alarmpolicy-form-save-id").trigger("click"); 383 $("#alarmpolicy-form-save-id").trigger("click");
384 - return true; 384 + //return true;
385 },null,['90%','90%']); 385 },null,['90%','90%']);
386 } 386 }
387 387
@@ -11,7 +11,7 @@ server: @@ -11,7 +11,7 @@ server:
11 key-store-password: Hg0801.. 11 key-store-password: Hg0801..
12 key-password: Hg0801.. 12 key-password: Hg0801..
13 url: 13 url:
14 - gateway: http://127.0.0.1:9200 14 + gateway: http://192.168.0.75:8080
15 inspection_web: http://127.0.0.1:8082 15 inspection_web: http://127.0.0.1:8082
16 assetsweb: http://127.0.0.1:8082 16 assetsweb: http://127.0.0.1:8082
17 mxgraph_editor: http://127.0.0.1:8085 17 mxgraph_editor: http://127.0.0.1:8085