monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 787a7ee0d049da7c0c5931ddbbf0722c07d8d1ff 2 parents 6cf3326e 7a70ee0e

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

状态指标散点图功能迁移-状态指标散点图在renderTextCols方法下更改 #2



See merge request !658
Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
@@ -162,7 +162,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -162,7 +162,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
162 } 162 }
163 titleStr = valueStr; 163 titleStr = valueStr;
164 } 164 }
165 - var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+ 165 + var tips = '<a class="detail_row_menu hide" data-statusf="'+statusF+'" data-id='+v.id+' data-flag='+v.flag+
166 ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' + 166 ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
167 ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' + 167 ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
168 // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' + 168 // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
@@ -236,12 +236,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -236,12 +236,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
236 }).done(function (res) { 236 }).done(function (res) {
237 var flags = ""; 237 var flags = "";
238 var kpiIdList= ""; 238 var kpiIdList= "";
239 - //start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08  
240 - let status=statusKpiList.indexOf(v.id);  
241 - if(status!=-1){  
242 - statusF=true;  
243 - }  
244 - //end lsq 2022-06-08  
245 var data = res.data; 239 var data = res.data;
246 if (data.length > 0) { 240 if (data.length > 0) {
247 var dataArr = common.splieceGroup(data, cols); 241 var dataArr = common.splieceGroup(data, cols);
@@ -252,6 +246,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -252,6 +246,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
252 $.each(v, function (j, ar) { 246 $.each(v, function (j, ar) {
253 var valueStr = ''; 247 var valueStr = '';
254 var titleStr = ''; 248 var titleStr = '';
  249 + //start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
  250 + let status=statusKpiList.indexOf(ar.id);
  251 + if(status!=-1){
  252 + statusF=true;
  253 + }
  254 + //end lsq 2022-06-08
255 if(ar.id == 'KPIE13DD9A3' ) { 255 if(ar.id == 'KPIE13DD9A3' ) {
256 valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: ar.value}); 256 valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: ar.value});
257 } else if (ar.value != 'null'){ 257 } else if (ar.value != 'null'){
@@ -274,10 +274,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -274,10 +274,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
274 kpiIdList += ar.id + ","; 274 kpiIdList += ar.id + ",";
275 } 275 }
276 //start lsq 更改下探图标的属性值 2022-06-08 276 //start lsq 更改下探图标的属性值 2022-06-08
277 - var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+  
278 - ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' + 277 + var tips = '<a class="detail_row_menu hide" data-statusf="'+statusF+'" data-id='+ar.id+' data-flag='+ar.flag+
  278 + ' data-name='+ar.name+' data-kpiname='+ar.name+' data-iswarning=1 data-ident=1' +
279 ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' + 279 ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
280 - ' data-restype='+(v.resType?v.resType:"")+'>\n' + 280 + ' data-restype='+(ar.resType?ar.resType:"")+'>\n' +
281 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' + 281 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
282 '</a>' 282 '</a>'
283 //end lsq 2022-06-08 283 //end lsq 2022-06-08
@@ -2491,7 +2491,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -2491,7 +2491,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
2491 var kpiName = d.kpiName == 'TYPE'?'ERRPT':d.kpiName; 2491 var kpiName = d.kpiName == 'TYPE'?'ERRPT':d.kpiName;
2492 let chbox=''; 2492 let chbox='';
2493 if(status!=-1){ 2493 if(status!=-1){
2494 - chbox='<a class="detail_row_menu hide" data-one="1" data-statusf='+statusF+' data-isWarning="' + d.isWarning + '" data-ident="' + d.kpiIdent + '" data-trend="' + d.isTrend + '" ' + 2494 + chbox='<a class="detail_row_menu hide" data-one="1" data-statusf="'+statusF+'" data-isWarning="' + d.isWarning + '" data-ident="' + d.kpiIdent + '" data-trend="' + d.isTrend + '" ' +
2495 'data-id="' + d.kpiId + '" data-kpiname="' + d.kpiName + '" data-name="' + d.name + '" data-flag="' + d.flag + '"' + 2495 'data-id="' + d.kpiId + '" data-kpiname="' + d.kpiName + '" data-name="' + d.name + '" data-flag="' + d.flag + '"' +
2496 'data-canca="' + d.canCA + '" data-incaing="' + d.inCAing + '" data-restype="' + d.resType + '"' + 2496 'data-canca="' + d.canCA + '" data-incaing="' + d.inCAing + '" data-restype="' + d.resType + '"' +
2497 '>' + 2497 '>' +