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

【1412】 X86服务器（ssh采集）详情页面增加指标展示-数值下探，下探样式 #2



See merge request !702

@@ -167,9 +167,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         }
                         }
                         titleStr = valueStr;
                         titleStr = valueStr;
                     }
                     }
-                    var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
+                    //lsq 判断基本信息的指标是否为新增的8个，如果是则有其他的下探 2022-06-29
+                    let nature='true';
+                    if(newKpiArr.indexOf(v.id)!=-1){
+                        nature='false'
+                    }
+                    let name=v.name;
+                    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-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-trend=0 data-unit="" data-hidem="hidem" data-nature="'+nature+'" ' +
                         // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
                         // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
                         ' data-restype='+(v.resType?v.resType:"")+'>\n' +
                         ' data-restype='+(v.resType?v.resType:"")+'>\n' +
                         '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
                         '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
@@ -181,8 +187,14 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                     }
                     }
                     var $html = addIconByValue(valueStr);
                     var $html = addIconByValue(valueStr);
                     var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
                     var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
+                    //lsq 判断基本信息的指标是否为新增的8个，如果是则数值有下探 2022-06-29
+                    let isProbeDown='';
+                    if(newKpiArr.indexOf(v.id)!=-1){
+                        isProbeDown='isProbeDown'
+                    }
                     li += ' <li><span ' + menuId + ' style="text-align:left;">' + v.name + '</span>' +
                     li += ' <li><span ' + menuId + ' style="text-align:left;">' + v.name + '</span>' +
-                        '<span title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
+                        '<span data-kpiid="'+v.id+'" data-flag="'+v.flag+'" data-warning="1" data-ident="1" data-trend="0" data-name="'+name+'"' +
+                        '  class="'+isProbeDown+'" title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
                         + $html + valueStr + '</span></li>'
                         + $html + valueStr + '</span></li>'
                 });
                 });
                 $("#" + targetId).html(li);
                 $("#" + targetId).html(li);
@@ -4146,6 +4158,31 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             },300)
             },300)
 
 
         });
         });
+        //lsq 新增的8个指标中数值点击打开性能曲线图 2022-06-28
+        $(".isProbeDown").unbind('click').click(function (e) {
+            if (e.preventDefault()) {
+                e.preventDefault();
+            }
+            if (e.stopPropagation()) {
+                e.stopPropagation();
+            }
+            let kpiId=$(this).data('kpiid');
+            let flag=$(this).data('flag');
+            let warning=$(this).data('warning');
+            let ident=$(this).data('ident');
+            let trend=$(this).data('trend');
+            let name=$(this).data('name');
+            var params = {
+                resId: resId,
+                kpiId: kpiId,
+                flag: flag,
+                warning: warning,
+                ident: ident,
+                trend: trend,
+                name: name
+            };
+            common.openLineChart(name, params);
+        });
         //点击空白处隐藏弹出菜单
         //点击空白处隐藏弹出菜单
         $(document).click(function(event){
         $(document).click(function(event){
             var _con = $('a.detail_row_menu');  // 设置目标区域
             var _con = $('a.detail_row_menu');  // 设置目标区域

@@ -8011,5 +8011,25 @@ form[lay-filter="activewarning-form"] .layui-inline {
 }
 }
 .layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li{
 .layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li{
     width:100%;
     width:100%;
+    padding:15px 20px;
+    box-sizing: border-box;
+    cursor: pointer;
+}
+.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li:hover{
+    color: #fff;
+    background: #0d82e9!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox{
+    position: fixed;
+    /*padding:0 10px;*/
+    z-index: 999;
+    background: #fff!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n-1),.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n){
+    background: #fff!important;
+}
+.isProbeDown{
+    cursor: pointer;
+    text-decoration: underline;
 }
 }
 /*end lsq 2022-06-28*/
 /*end lsq 2022-06-28*/