monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit df90d316d2dbffa05d30466c779c879a331b2f02 2 parents c828f211 7eadcdfd

Merge branch 'master-v32-lushangqing' into 'master' 

详情页的状态指标下探更改-【需确认如何解决增加状态指标下探时会默认增加压制次数】



See merge request !644
Inline Side-by-side
Showing 1 changed file with 153 additions and 94 deletions
... ... @@ -25,10 +25,60 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
//资源详细页面相关调用函数，包含各种展示类型的
let editKpiList = [];
let statusKpiList=[];//lsq 状态指标数据 2022-06-08
var obj = {
detailTimer:[],
timerTime: 180000,
sessions: layui.sessions,
getStatusKpiList:function (){
//start lsq 根据kpiid获取是否是指标状态 2022-05-23
if(statusKpiList.length != 0){
return statusKpiList;
}
statusKpiList = [];
admin.req({
url: common.domainName + '/api-web/manage/kpi/page?' +
'isWarning=&isTrend=&kpiLevel=&ignoreCnt=&startTime=&endTime=&kpiPower=',
data: {
page:1,limit:99999,
kpiName: '',resType: '',kpiIdent: 2,kpiCategory: '',
kpiDataType:'',kpiUnit:'',isWarning:'',isTrend:'',
kpiLevel:'',ignoreCnt:'',startTime:'',endTime:'',kpiPower:''
},
success(response) {
let arr=[];
if (response && response.success) {
arr=response.data;
arr.map(item=>{
statusKpiList.push(item.kpiId)
})
/*let idArr=[];
let idStr='';
if(id.indexOf(',')!=-1){
idArr=id.split(',');
idStr=idArr[0];
}else{
idStr=id;
}
let isKpi=false;
arr.map(item=>{
if(idStr==item.kpiId){
isKpi=true;
}
})
if(isKpi){
let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';
$("#detail_menubox_id ul").append(menuboxStr)
}*/
} else {
// layer.msg('状态指标获取失败!', {icon: 2});
}
},
error(){
// layer.msg('状态指标获取失败!', {icon: 2});
}
});
},
// 获取编辑指标
getEditKpiList:function (){
var editFlag = localStorage.getItem("editFlag");//是否编辑状态
... ... @@ -75,6 +125,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
{"flag": "base","name": "最近采集时间","id": "KPIF74D9D2B","value": "2019-12-16 10:04:54","status": "0" }]}
*/
renderText: function (targetId, resId, kpiId, fn, hasTotal,flag,isBasic) {
//start lsq 状态信息的状态也增加下探 202-06-08
let statusF=false;//是否为状态信息
//end lsq 2022-06-08
var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId + "&hasTotal=" + hasTotal;
if (flag) {
url += '&flag=' + flag;
... ... @@ -98,7 +151,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
var fontColor='';
var valueStr = '';
var titleStr = '';
if(v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D'){
//start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
let status=statusKpiList.indexOf(v.id);
if(status!=-1){
statusF=true;
}
//end lsq 2022-06-08
if(v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' ){
valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: v.value});
//获取flag
$.each(v.value, function (i, v) {
... ... @@ -122,13 +181,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
titleStr = valueStr;
}
var tips = '<a class="detail_row_menu hide">\n' +
/* var tips = '<a class="detail_row_menu hide">\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'*/
var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
// ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
' data-restype='+(v.resType?v.resType:"")+'>\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'
var menuId = "";
if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D') {
if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status!=-1) {
v.name = v.name + tips;
menuId = "id=\"" + targetId + "_detail_row_menu\"";
menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
}
var $html = addIconByValue(valueStr);
var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
... ... @@ -140,22 +206,26 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
fn && fn();
//初始化监听告警压制需要的数据
var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
rowMenu.attr("data-id", kpiIdList);
rowMenu.attr("data-flag", flags);
rowMenu.attr("data-name", "监控连接状态");
rowMenu.attr("data-kpiname", "监控连接状态");
rowMenu.attr("data-iswarning", "1");
rowMenu.attr("data-ident", "1");
rowMenu.attr("data-trend", "0");
rowMenu.attr("data-unit", "");
rowMenu.attr('data-hidem', 'true');
rowMenu.attr('data-nature', 'true');//性能趋势
// rowMenu.attr('data-canca', data.canCA);
// rowMenu.attr('data-incaing', data.inCAing);
rowMenu.attr('data-restype', (data && data[0])?data[0].resType:'');
if(!statusF){
var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
rowMenu.attr("data-id", kpiIdList);
rowMenu.attr("data-flag", flags);
rowMenu.attr("data-name", "监控连接状态");
rowMenu.attr("data-kpiname", "监控连接状态");
rowMenu.attr("data-iswarning", "1");
rowMenu.attr("data-ident", "1");
rowMenu.attr("data-trend", "0");
rowMenu.attr("data-unit", "");
rowMenu.attr('data-hidem', 'true');
rowMenu.attr('data-nature', 'true');//性能趋势
// rowMenu.attr('data-canca', data.canCA);
// rowMenu.attr('data-incaing', data.inCAing);
rowMenu.attr('data-restype', (data && data[0])?data[0].resType:'');
}
//监听告警压制等操作配置
$('#' + targetId + "_detail_row_menu").hover(function () {
// $('#' + targetId + "_detail_row_menu").hover(function () {
$('#' + targetId + "_detail_row_menu.statusMenu").hover(function () {
var $that = $(this);
var $btn = $that.find(".detail_row_menu");
if ($btn.length > 0) {
... ... @@ -175,6 +245,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
* @param cols 指定列（一组key value为一列）
*/
renderTextCols: function (targetId, resId, kpiId, cols, isBasic) {
//start lsq 状态信息的状态也增加下探 202-06-08
let statusF=false;//是否为状态信息
//end lsq 2022-06-08
var url = "/api-web/detail/block?resId=" + resId + "&kpiId=" + kpiId;
if (isBasic) {
url += '&isBasic=' + isBasic;
... ... @@ -184,6 +257,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}).done(function (res) {
var flags = "";
var kpiIdList= "";
//start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
let status=statusKpiList.indexOf(v.id);
if(status!=-1){
statusF=true;
}
//end lsq 2022-06-08
var data = res.data;
if (data.length > 0) {
var dataArr = common.splieceGroup(data, cols);
... ... @@ -215,13 +294,21 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
//获取kpi
kpiIdList += ar.id + ",";
}
var tips = '<a class="detail_row_menu hide">\n' +
//start lsq 更改下探图标的属性值 2022-06-08
/* var tips = '<a class="detail_row_menu hide">\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'*/
var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
' data-restype='+(v.resType?v.resType:"")+'>\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'
//end lsq 2022-06-08
var menuId = "";
if (ar.id == 'KPIE13DD9A3' || ar.id == 'KPI02786E8D') {
if (ar.id == 'KPIE13DD9A3' || ar.id == 'KPI02786E8D' || status!=-1) {
ar.name = ar.name + tips;
menuId = "id=\"" + targetId + "_detail_row_menu\"";
menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
}
var $html = addIconByValue(valueStr);
var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.id);
... ... @@ -243,21 +330,23 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
$("#" + targetId).html(li);
}
//初始化监听告警压制需要的数据
var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
rowMenu.attr("data-id", kpiIdList);
rowMenu.attr("data-flag", flags);
rowMenu.attr("data-name", "监控连接状态");
rowMenu.attr("data-kpiname", "监控连接状态");
rowMenu.attr("data-iswarning", "1");
rowMenu.attr("data-ident", "1");
rowMenu.attr("data-trend", "0");
rowMenu.attr("data-unit", "");
rowMenu.attr('data-hidem', 'true');
rowMenu.attr('data-nature', 'true');//性能趋势
rowMenu.attr('data-restype', data[0]?data[0].resType:'');
if(!statusF){
var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
rowMenu.attr("data-id", kpiIdList);
rowMenu.attr("data-flag", flags);
rowMenu.attr("data-name", "监控连接状态");
rowMenu.attr("data-kpiname", "监控连接状态");
rowMenu.attr("data-iswarning", "1");
rowMenu.attr("data-ident", "1");
rowMenu.attr("data-trend", "0");
rowMenu.attr("data-unit", "");
rowMenu.attr('data-hidem', 'true');
rowMenu.attr('data-nature', 'true');//性能趋势
rowMenu.attr('data-restype', data[0]?data[0].resType:'');
}
//监听告警压制等操作配置
$('#' + targetId + "_detail_row_menu").hover(function () {
// $('#' + targetId + "_detail_row_menu").hover(function () {
$('#' + targetId + "_detail_row_menu.statusMenu").hover(function () {
var $that = $(this);
var $btn = $that.find(".detail_row_menu");
if ($btn.length > 0) {
... ... @@ -3357,7 +3446,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
, done: function (res) {
if(res.data && res.data.length>0){
let listData=res.data;
//
$('#title-shutdown').css("width",'600px')
let carouselStr=`
<img src="/src/style/img/shutdown.png" style="position: absolute;top: 0; left: -3px;" alt="">
<div style="background: transparent; height: 30px;font-size: 14px; color:#ff0000; display: flex;align-items: center;">
... ... @@ -3377,24 +3466,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
$("#marqueeDiv").mouseout(function (){
this.start();
})
/*//轮播切换
let options={
width: '630px'
, height:'30px'
, arrow: 'none'
, autoplay: true//自动切换
, interval:5000//自动切换的时间间隔
// , trigger: (layui.device().ios || layui.device().android) ? 'click' : 'hover'
, anim: 'default' //切换动画的方式 fade,default,updown
, index: 0
, indicator:'none'//指示器的位置 outside，inside,none
}
var ins=carousel.render({
elem: '#shutdown-carousel'
});
//重置轮播
ins.reload(options);*/
//end lsq 2022-05-24
}else{
$('#title-shutdown').css("width",'0px')
}
}
})
... ... @@ -3894,6 +3969,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
var canCA = $menu.data('canca');
var inCAing = $menu.data('incaing');
var nature = $menu.data('nature');
//lsq 状态信息无其他下探 2022-06-08
var statusF = $menu.data('statusf');
var menubox = '<div class="detail_menubox" id="detail_menubox_id" style="color:#666;"><ul>';
if (!nature) {
menubox +=
... ... @@ -3906,8 +3983,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
if (!nature) {
menubox += '<li type="t"><i class="layui-icon">&#xe62c;</i>性能趋势</li>';
}
menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
// if(!statusF){
menubox += '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
// }
if (canCA) {
if (inCAing) {
menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
... ... @@ -3938,45 +4016,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
flag = flag.replace(/^\s+|\s+$/g, "");
}
//start lsq 根据kpiid获取是否是指标状态 2022-05-23
admin.req({
url: common.domainName + '/api-web/manage/kpi/page?' +
'isWarning=&isTrend=&kpiLevel=&ignoreCnt=&startTime=&endTime=&kpiPower=',
data: {
page:1,limit:99999,
kpiName: '',resType: '',kpiIdent: 2,kpiCategory: '',
kpiDataType:'',kpiUnit:'',isWarning:'',isTrend:'',
kpiLevel:'',ignoreCnt:'',startTime:'',endTime:'',kpiPower:''
},
success(response) {
let arr=[];
if (response && response.success) {
arr=response.data;
let idArr=[];
let idStr='';
if(id.indexOf(',')!=-1){
idArr=id.split(',');
idStr=idArr[0];
}else{
idStr=id;
}
let isKpi=false;
arr.map(item=>{
if(idStr==item.kpiId){
isKpi=true;
}
})
if(isKpi){
let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';
$("#detail_menubox_id ul").append(menuboxStr)
}
} else {
// layer.msg('状态指标获取失败!', {icon: 2});
}
},
error(){
// layer.msg('状态指标获取失败!', {icon: 2});
let idArr=[];
let idStr='';
if(id.indexOf(',')!=-1){
idArr=id.split(',');
idStr=idArr[0];
}else{
idStr=id;
}
let isKpi=false;
statusKpiList.map(item=>{
if(idStr==item){
isKpi=true;
}
});
})
if(isKpi){
let menuboxStr = '<li type="link-status-kpi"><i class="layui-icon">&#xe758;</i>状态指标</li>';
$("#detail_menubox_id ul").append(menuboxStr)
}
setTimeout(function (){
//end lsq 2022-05-23
//菜单点击事件
... ... @@ -4049,6 +4106,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
});
}
//lsq 页面加载完就调用一下获取状态指标列表数据 2022-06-08
obj.getStatusKpiList();
//对外暴露的接口
exports('commonDetail', obj);
});
... ...