diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
index 5e9db5e..19e1ea3 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
@@ -24,10 +24,42 @@ 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)
+ })
+ } else {
+ // layer.msg('状态指标获取失败!', {icon: 2});
+ }
+ },
+ error(){
+ // layer.msg('状态指标获取失败!', {icon: 2});
+ }
+ });
+ },
// 获取编辑指标
getEditKpiList:function (){
var editFlag = localStorage.getItem("editFlag");//是否编辑状态
@@ -74,6 +106,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;
@@ -97,6 +132,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
var fontColor='';
var valueStr = '';
var titleStr = '';
+ //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
@@ -124,10 +165,17 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
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);
@@ -139,23 +187,27 @@ 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.resType);
- 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.resType);
+ 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 +227,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 +239,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 +276,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,20 +312,24 @@ 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 && 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 && 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) {
@@ -4138,6 +4211,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 +=
@@ -4150,8 +4225,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
if (!nature) {
menubox += '<li type="t"><i class="layui-icon"></i>性能趋势</li>';
}
-
+ // if(!statusF){
menubox += '<li type="n"><i class="layui-icon"></i>压制次数</li>';
+ // }
+
// Start Wang 2022/3/28 14:06 833:屏蔽纳入容量预测按钮 https://hgkj.zentaopm.com/task-view-833.html
// 后面计划将功能作为配置项
// if (canCA) {
@@ -4182,45 +4259,25 @@ 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"></i>状态指标</li>';
- $("#detail_menubox_id ul").append(menuboxStr)
- }
- } else {
- // layer.msg('状态指标获取失败!', {icon: 2});
- }
- },
- error(){
- // layer.msg('状态指标获取失败!', {icon: 2});
+ //start lsq 根据kpiid获取是否是指标状态 2022-05-23
+ 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"></i>状态指标</li>';
+ $("#detail_menubox_id ul").append(menuboxStr)
+ }
setTimeout(function (){
//end lsq 2022-05-23
//菜单点击事件
@@ -4289,7 +4346,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
});
}
-
+ //lsq 页面加载完就调用一下获取状态指标列表数据 2022-06-08
+ obj.getStatusKpiList();
//对外暴露的接口
exports('commonDetail', obj);
});