Authored by 鲁尚清

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing
... ... @@ -30,6 +30,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
,range: true
});
var resType = localStorage.getItem("currentResType");
// 获取合并通知开关是否开启
getNoticeMergeFlag();
function getNoticeMergeFlag(){
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
, method: 'POST'
, async: false
, success: function (res) {
$.each(res.data, function (i, v) {
if(v.ddicCode == 'on'){
$('#noticeMergeTab').show();
}
});
}
})
}
//编辑
if(data && data.id){
admin.req({
... ... @@ -48,6 +66,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
$("#alarmPolicyType").val(res.object.policyType);
}
});
// 获取通知合并策略的表达式
admin.req({
url:domainName + '/api-web/policyMerge/get?noticeMergePolicyId='+data.id
,done:function (res){
$("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
}
});
}else{
$("#seriousTimes").val('00:00:00 - 23:59:59');
$("#importantTimes").val('00:00:00 - 23:59:59');
... ... @@ -179,7 +205,85 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
data.seriousTimes = $("#seriousTimes").val();
data.importantTimes = $("#importantTimes").val();
data.commonlyTimes = $("#commonlyTimes").val();
var that = this;
if(!data.kpiId){
layer.msg("请先选择指标!", {
icon: 7
, time: 3000
});
return false;
}
if(!data.kpiId || data.kpiId == ''){
layer.msg("请先选择指标!", {
icon: 7
, time: 3000
});
return false;
}
if(!data.alarmContentExpr || data.alarmContentExpr == ''){
layer.msg("请先填写告警内容描述表达式!", {
icon: 7
, time: 3000
});
return false;
}
if(!data.alarmContentExpr || data.alarmContentExpr == ''){
layer.msg("请先填写告警内容描述表达式!", {
icon: 7
, time: 3000
});
return false;
}
var importantPolicy = data.seriousPolicy;
var importantExpr = data.importantPolicy;
var commonlyPolicy = data.commonlyPolicy;
if((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')){
layer.msg("严重、重要和一般告警的表达式必须有一项不为空!", {
icon: 7
, time: 3000
});
return false;
}
if(!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == ''){
layer.msg("请先填写通知合并策略描述表达式!", {
icon: 7
, time: 3000
});
return false;
}
/**
* 保存通知合并策略
*/
var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val()
function saveNoticeMerge(id){
var noticeMergeData = {
"mergePolicyId": id,
"mergePolicyName": data.alarmPolicyName,
"mergePolicyDesc": data.alarmPolicyName,
"noticeMergeExpr": noticeMergeFlagExpr,
"policyType": data.policyType,
"kpiId": data.kpiId
}
admin.req({
url : domainName + '/api-web/policyMerge/save?access_token='+accessToken
,data:JSON.stringify(noticeMergeData)
,type:'post'
,contentType: "application/json; charset=utf-8"
,done:function (res){
if(!res.success){
layer.msg(res.msg ? res.msg : '通知合并策略保存失败', { offset: '15px' , icon: 7 , time: 1000 });
}
}
});
}
charToExpr(data, 'alarmContentExpr');
charToExpr(data, 'cleanPolicy');
charToExpr(data, 'commonlyExpr');
... ... @@ -187,6 +291,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
charToExpr(data, 'seriousExpr');
form.on('submit(add-alarmpolicy-form)',function () {
delete data.noticeMergeFlagExpr;
admin.req({
url : domainName + '/api-web/alarmPolicy/save?access_token='+accessToken
,data:JSON.stringify(data)
... ... @@ -194,6 +299,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
,contentType: "application/json; charset=utf-8"
,done:function (res){
if(res.success){
// 保存通知合并策略
saveNoticeMerge(res.str);
localStorage.setItem("detailPageOfcustomPolicyId",res.str)
layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){
localStorage.removeItem("currentResType");
... ... @@ -263,4 +371,4 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
$('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled","disabled");
}
});
});
\ No newline at end of file
});
... ...
... ... @@ -660,6 +660,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
layer.open(Object.assign({
title: [name, 'font-size:18px;'],
type: 1,
id:(new Date()).getTime(),
area: area,
resize: false,
shadeClose: true,//开启遮罩层
... ...
... ... @@ -338,14 +338,38 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
setDefault('select-content-ul',warnVal,'#warn-text-view');
setDefault('select-content-ul-bus',busVal,'#bus-text-view');
var resourceHealthTips ;
$("#resource-health-tips").hover(function() {
openMsg();
}, function() {
layer.close(resourceHealthTips);
});
function openMsg() {
resourceHealthTips = layer.tips("<span style='color:#585858;'>" +
"按照积分制方式计算健康状态,即图标颜色:<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 告警:1个严重告警计10分;1个重要告警计5分;1个一般告警计1分<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 所有计分累加<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;起始分为0分,最后得分为计分和;<br>" +
"<br>" +
"得分与健康状态关系:<br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 0:状态正常,无告警,颜色为<a style='color: #00a522'>绿色</a><br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 大于0且小于等于10:普通问题,最多1个严重告警,颜色为<a style='color: #a4910a'>深黄</a><br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 大于10且小于等于30:一般问题,最多3个严重告警,颜色为<a style='color: #e2c705'>黄色</a><br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 大于30且小于等于50:严重问题,最多5个严重告警,颜色为<a style='color: #ffaf00'>橙色</a><br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 大于50且小于等于100:比较严重,最多10个严重告警,颜色为<a style='color: #f65f0b'>深橙</a><br>" +
"&nbsp;&nbsp;&nbsp;&nbsp;• 大于100:非常严重,10个严重告警以上,颜色为<a style='color: #d81e06'>红色<br>" +
"</span>",
'#resource-health-tips',{tips:[2,'#F0F0F0'], time:0,area: ['auto', 'auto']});
}
// Start 告警级别默认为严重告警,点击左下角选择告警级别,页面的小红点切换不同告警的数量,item根据告警数量进行排序 LSQ 2021/12/29 19:37
$(".select-total").hide();
$(".select-serious").hide();
$(".select-important").hide();
$(".select-normal").hide();
var itemArr=$(".index-banner-item");
itemArr.map((index,item)=>{
if($(item).data('serious')=='0'){
$(item).find('.select-serious').hide();
if($(item).data('total')=='0'){
$(item).find('.select-total').hide();
}
$(item).css('order',$(item).data('serious'))
})
... ...
... ... @@ -62,13 +62,13 @@
</fieldset>
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
<li class="layui-this">告警内容</li>
<li class="layui-this"><span style="color:red">*</span>告警内容</li>
<li>严重</li>
<li>重要</li>
<li>一般</li>
<li>一般告警</li>
<li>过滤</li>
<li>消除</li>
<!-- <li>告警内容表达式</li>-->
<li id="noticeMergeTab" style="display: none"><span style="color:red">*</span>通知合并策略</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show content-tab-item">
... ... @@ -355,50 +355,19 @@
</div>
</div>
</div>
<!-- <div class="layui-tab-item">-->
<!-- <div class="content-box-group">-->
<!-- <div class="box-group-left">告警内容表达式</div>-->
<!-- <div class="box-group-right">-->
<!-- <div class="layui-form-item">-->
<!-- <div class="layui-input-block">-->
<!-- <input type="radio" name="alarmcotent-policy-type" data-flag="alarmcotent" value="1" title="基础" checked lay-filter="alarm-policy-rule-type">-->
<!-- <input type="radio" name="alarmcotent-policy-type" data-flag="alarmcotent" value="2" title="正则" lay-filter="alarm-policy-rule-type">-->
<!-- <input type="radio" name="alarmcotent-policy-type" data-flag="alarmcotent" value="3" title="自定义"lay-filter="alarm-policy-rule-type">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item cont-base" id="alarmcotent-policy-box">-->
<!-- <div class="layui-input-inline smallwith">-->
<!-- <select class="alarmcotent_condition">-->
<!-- <option value="0">大于</option>-->
<!-- <option value="1">小于</option>-->
<!-- <option value="2">等于</option>-->
<!-- <option value="3">大于等于</option>-->
<!-- <option value="4">小于等于</option>-->
<!-- <option value="5">字符串等于</option>-->
<!-- <option value="6">字符串包含</option>-->
<!-- <option value="7">字符串前匹配</option>-->
<!-- <option value="8">字符串后匹配</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="layui-input-inline smallwith">-->
<!-- <input type="tel" autocomplete="off" class="layui-input" flag="alarmcotent_value">-->
<!-- </div>-->
<!-- <div class="layui-form-mid layui-word-aux"><i data-id="alarmcotent-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div>-->
<!-- <div class="layui-form-mid layui-word-aux"><i data-id="alarmcotent-policy-box" class="layui-icon oper-icon policy-input-del hide">&#xe67e;</i></div>-->
<!-- </div>-->
<!-- <div class="layui-form-item cont-base">-->
<!-- <div class="layui-input-block">-->
<!-- <a class="layui-btn layui-btn-sm layui-btn-normal createpolicybtn" data-flag="alarmcotent">生成策略</a>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item cont-other">-->
<!-- <div class="layui-input-block">-->
<!-- <textarea placeholder="请输入内容" class="layui-textarea" name="alarmContentExpr" id="alarmcotentPolicy"></textarea>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-tab-item content-tab-item">
<!-- 通知合并策略 -->
<div class="content-box-group">
<div class="box-group-left" style="text-align: center">通知合并策略<br/>描述表达式</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-block">
<textarea placeholder="请输入内容" class="layui-textarea" id="noticeMergeFlagExpr" name="noticeMergeFlagExpr"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
... ... @@ -408,4 +377,4 @@
layui.use('alarmpolicyAdd', function (fn) {
fn({{d}});
});
</script>
\ No newline at end of file
</script>
... ...
<article>
<style>
label.task-choose-resname {
color: #fff;
background-color: #1e9fff;
min-height: 27px;
font-size: 12px;
display: inline-block;
margin-top: 5px;
line-height: 27px;
padding-left: 8px;
min-width: 223px;
margin-left: 15px;
}
</style>
<div class="layui-card">
<form class="layui-form layui-form-pane" lay-filter="form-task-bindchecktemp"
onsubmit="return false;">
... ... @@ -47,7 +33,7 @@
<button class="layui-btn layui-btn-primary hide" id="btn-task-bindchecktemp-unselectres"><i
class="layui-icon">&#xe640;</i>取消选择
</button>
<div id="txt-task-bindchecktemp-res"></div>
<div id="txt-task-bindchecktemp-res" style="position: absolute;margin-top: -27px;margin-left: 120px"></div>
</div>
</div>
</div>
... ... @@ -83,4 +69,4 @@
layui.use('taskbindchecktemp', function (fn) {
fn({{ d }});
});
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -34,6 +34,7 @@
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -54,6 +55,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -126,6 +128,7 @@
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -226,6 +229,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ... @@ -268,16 +282,18 @@
<div class="num">
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="biz_resStatus" id="normal_biz">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_resStatus" id="worse_biz">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_resStatus" id="worst_biz">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_resStatus" id="worst_biz">0</span>/
<span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="biz_resStatus" id="healthNone_biz">0</span>
</div>
</div>
<div class="info-box-count">
<i></i>
<label>资源状态</label>
<div class="num">
<span class="blue" lay-tips="资源状态:未监控" data-value="new" data-target="biz_state" id="newstate_biz">0</span>/
<span class="green" lay-tips="资源状态:监控中" data-value="monitor" data-target="biz_state" id="monitorstate_biz">0</span>/
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_state" id="stopstate_biz">0</span>
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_state" id="stopstate_biz">0</span>/
<span class="gray" lay-tips="资源状态:未监控" data-value="new" data-target="biz_state" id="newstate_biz">0</span>
</div>
</div>
<div class="info-box-count">
... ... @@ -285,7 +301,8 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态:成功" data-value="normal" data-target="bizlink_state" id="linksuccess_biz">0</span>/
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="bizlink_state" id="linkfail_biz">0</span>
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="bizlink_state" id="linkfail_biz">0</span>/
<span class="gray" lay-tips="连接状态:未监控" data-value="9" data-target="bizlink_state" id="linkNone_biz">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ... @@ -316,6 +333,7 @@
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="biz_treetable_resStatus" id="tree_normal_biz">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_treetable_resStatus" id="tree_worse_biz">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_treetable_resStatus" id="tree_worst_biz">0</span>
<span class="red" lay-tips="健康状态: 未监控" data-value="none" data-target="biz_treetable_resStatus" id="tree_healthNone_biz">0</span>
</div>
</div>
<div class="info-box-count">
... ...
... ... @@ -28,6 +28,7 @@
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -37,6 +38,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -216,16 +218,17 @@
<div class="num">
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="biz_reslist_resStatus" data-field="normal">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus" data-field="worse">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span>/
<span class="gray" lay-tips="连接状态:未监控" data-value="none" data-target="biz_reslist_resStatus" data-field="healthNone">0</span>
</div>
</div>
<div class="info-box-count">
<i></i>
<label>资源状态</label>
<div class="num">
<span class="blue" lay-tips="资源状态:未监控" data-value="new" data-target="biz_reslist_state" data-field="newstate">0</span>/
<span class="green" lay-tips="资源状态:监控中" data-value="monitor" data-target="biz_reslist_state" data-field="monitorstate">0</span>/
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>/
<span class="gray" lay-tips="资源状态:未监控" data-value="new" data-target="biz_reslist_state" data-field="newstate">0</span>
</div>
</div>
<div class="info-box-count div-link-state" style="display: none">
... ... @@ -233,7 +236,8 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态:成功" data-value="normal" data-target="biz_reslist_link_state" data-field="linksuccess">0</span>/
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span>
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span>/
<span class="gray" lay-tips="连接状态:未监控" data-value="9" data-target="biz_reslist_link_state" data-field="linkNone">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ...
... ... @@ -52,6 +52,7 @@
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -72,6 +73,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -230,6 +232,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ... @@ -431,16 +444,18 @@
<div class="num">
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="domain_resStatus" id="normal_domain"></span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="domain_resStatus" id="worse_domain"></span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="domain_resStatus" id="worst_domain"></span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="domain_resStatus" id="worst_domain"></span>/
<span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="domain_resStatus" id="healthNone_domain">0</span>
</div>
</div>
<div class="info-box-count">
<i></i>
<label>资源状态</label>
<div class="num">
<span class="blue" lay-tips="资源状态:未监控" data-value="new" data-target="domain_state" id="newstate_domain"></span>/
<span class="green" lay-tips="资源状态:监控中" data-value="monitor" data-target="domain_state" id="monitorstate_domain"></span>/
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="domain_state" id="stopstate_domain"></span>
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="domain_state" id="stopstate_domain"></span>/
<span class="gray" lay-tips="资源状态:未监控" data-value="new" data-target="domain_state" id="newstate_domain"></span>
</div>
</div>
<div class="info-box-count">
... ... @@ -448,7 +463,8 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态:成功" data-value="normal" data-target="domainlink_state" id="linksuccess_domain"></span>/
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="domainlink_state" id="linkfail_domain"></span>
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="domainlink_state" id="linkfail_domain"></span>/
<span class="gray" lay-tips="连接状态:未监控" data-value="9" data-target="domainlink_state" id="linkNone_domain">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ...
... ... @@ -293,7 +293,7 @@
<div class="index-banner-title">
<i class="{{bizClas}}"></i>
<span>{{item.title}}<a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}" data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px" lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></span>
<span><a id="resource-health-tips" style="color: #01AAED;">{{item.title}}</a><a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}" data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px" lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></span>
<div class="index-banner-title-desc"><span>{{item.countTxt}}</span></div>
</div>
<div class="index-banner-group-list">
... ...
... ... @@ -78,6 +78,7 @@
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -98,6 +99,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -336,6 +338,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ... @@ -365,16 +378,18 @@
<div class="num">
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="resStatus " id="normal_res">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="resStatus" id="worse_res">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="resStatus" id="worst_res">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="resStatus" id="worst_res">0</span>/
<span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="resStatus" id="healthNone_res">0</span>
</div>
</div>
<div class="info-box-count">
<i></i>
<label>资源状态</label>
<div class="num">
<span class="blue" lay-tips="资源状态:未监控" data-value="new" data-target="state" id="newstate_res">0</span>/
<span class="green" lay-tips="资源状态:监控中" data-value="monitor" data-target="state" id="monitorstate_res">0</span>/
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="state" id="stopstate_res">0</span>
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="state" id="stopstate_res">0</span>/
<span class="gray" lay-tips="资源状态:未监控" data-value="new" data-target="state" id="newstate_res">0</span>
</div>
</div>
<div class="info-box-count">
... ... @@ -382,7 +397,8 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态:成功" data-value="normal" data-target="link_state" id="linksuccess_res">0</span>/
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="link_state" id="linkfail_res">0</span>
<span class="red" lay-tips="连接状态:失败" data-value="unnormal" data-target="link_state" id="linkfail_res">0</span>/
<span class="gray" lay-tips="连接状态:未监控" data-value="9" data-target="bizlink_state" id="linkNone_res">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ... @@ -412,16 +428,17 @@
<div class="num">
<span class="green" lay-tips="健康状态:优" data-value="3" data-target="treetable_resStatus" id="tree_normal_res">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="treetable_resStatus" id="tree_worse_res">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span>/
<span class="gray" lay-tips="健康状态: 未监控" data-value="1" data-target="treetable_resStatus" id="tree_healthNone_res">0</span>
</div>
</div>
<div class="info-box-count">
<i></i>
<label>资源状态</label>
<div class="num">
<span class="blue" lay-tips="资源状态:未监控" data-value="new" data-target="treetable_res_state" id="tree_newstate_res">0</span>/
<span class="green" lay-tips="资源状态:监控中" data-value="monitor" data-target="treetable_res_state" id="tree_monitorstate_res">0</span>/
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span>
<span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span>/
<span class="gray" lay-tips="资源状态:未监控" data-value="new" data-target="treetable_res_state" id="tree_newstate_res">0</span>
</div>
</div>
<!--<div class="info-box-count">
... ...
... ... @@ -45,20 +45,35 @@ export default {
getUrl();
//start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15
window.addEventListener('message',function(e){
if(e.data.type=='detail'){
let data = e.data;
if(data.type=='detail'){
proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy);
}else if(e.data.type=='topology'){
}else if(data.type=='topology'){
let resId = data.data.resId;
if(!resId){
// 针对业务的跳转
let busId = e.data.data.busId;
if(busId){
let url = `${sessionStorage.getItem("graphEditorOrigin")}/jgraph/grapheditor/viewer.html?access_token=${localStorage.getItem('access_token')}&id=${busId}&layout=organic`
proxy.$global.layui.layer.open({
type: 2,
id : 'topology_' + (new Date()).getTime(),
content: url,
area: ['90%', '90%'],
title: ''
});
}
return;
}
//子页面点击拓扑图标进入拓扑页面
proxy.$global.viewResTopo(e.data.data.resId);
} else if(e.data.type == 'openJimu' || e.data.type == 'openAJ') {
// 打开报表页面
let data = e.data.data;
let resId = data.resId;
let kpiId = data.kpiId;
let flag = data.flag;
let reportCode = data.reportCode;
let title = data.title;
let title = data.data.title;
let url ;
let params = `resId=${resId}&kpiId=${kpiId}&flag=${flag}&access_token=${localStorage.getItem('access_token')}`
if(e.data.type == 'openJimu'){
... ...
... ... @@ -753,15 +753,18 @@
if(d.hostState == 'active' || d.hostState == 'connected' || d.hostState == '正常' ){
linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接成功</li>`;
}else{
}else if(d.hostState == '' && d.linkState == '未监控'){
linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">未监控</button>';
linkStateTips += `<li class='li-link-state-tips-red'>未监控</li>`;
}else {
linkStateHtml = `<button type="button"
id="${d.resId}_bizdanger"
data-message="${d.message}"
data-state="${d.state}"
data-id="${d.resId}_bizdanger"
class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
id="${d.resId}_bizdanger"
data-message="${d.message}"
data-state="${d.state}"
data-id="${d.resId}_bizdanger"
class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
失败
</button>`;
</button>`;
if(d.hostState!=''){
linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接失败</li>`;
}else{
... ... @@ -875,6 +878,9 @@
{{# if(d.health === '3'){ }}
<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click"></button>
{{# } }}
{{# if(d.health === 'none'){ }}
<button type="button" class="layui-btn layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">未监控</button>
{{# } }}
</script>
<!--主机状态-->
<script type="text/html" id="hostStateTpl">
... ... @@ -915,7 +921,7 @@
{{#
switch (d.state) {
case "new" :
}} <button type="button" class="layui-btn layui-btn-warm layui-bg-blue layui-btn-radius layui-btn-xs p-0-15 cant-click">未监控</button> {{#
}} <button type="button" class="layui-btn layui-btn-warm layui-bg-gray layui-btn-radius layui-btn-xs p-0-15 cant-click">未监控</button> {{#
break;
case "monitor" :
}} <button type="button" class="layui-btn layui-btn-warm layui-bg-green layui-btn-radius layui-btn-xs p-0-15 cant-click">监控中</button> {{#
... ...