Merge branch 'master-V32-XuHaoJie' into 'master'

天津-详情页面-过滤指标优化



See merge request !209

@@ -84,6 +84,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             admin.req({
             admin.req({
                 url: common.domainName + url
                 url: common.domainName + url
             }).done(function (res) {
             }).done(function (res) {
+                var flags = "";
                 var data = res.data;
                 var data = res.data;
                 var li = "";
                 var li = "";
                 $.each(data, function (i, v) {
                 $.each(data, function (i, v) {
@@ -92,6 +93,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                     var titleStr = '';
                     var titleStr = '';
                     if(v.id == 'KPIE13DD9A3') {
                     if(v.id == 'KPIE13DD9A3') {
                         valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: v.value});
                         valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: v.value});
+                        //获取flag
+                        $.each(v.value, function (i, v) {
+                            flags += v.flag + ",";
+                        });
+                        if (flags != '') {
+                            flags = flags.substring(0, flags.length - 1);
+                        }
                     } else if (v.value != 'null'){
                     } else if (v.value != 'null'){
                         valueStr = v.value;
                         valueStr = v.value;
                         var old = v.value;
                         var old = v.value;
@@ -125,7 +133,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 //初始化监听告警压制需要的数据
                 //初始化监听告警压制需要的数据
                 var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
                 var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
                 rowMenu.attr("data-id", "KPIE13DD9A3");
                 rowMenu.attr("data-id", "KPIE13DD9A3");
-                rowMenu.attr("data-flag", "");
+                rowMenu.attr("data-flag", flags);
                 rowMenu.attr("data-name", "监控连接状态");
                 rowMenu.attr("data-name", "监控连接状态");
                 rowMenu.attr("data-kpiname", "监控连接状态");
                 rowMenu.attr("data-kpiname", "监控连接状态");
                 rowMenu.attr("data-iswarning", "1");
                 rowMenu.attr("data-iswarning", "1");
@@ -133,10 +141,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 rowMenu.attr("data-trend", "0");
                 rowMenu.attr("data-trend", "0");
                 rowMenu.attr("data-unit", "");
                 rowMenu.attr("data-unit", "");
                 rowMenu.attr('data-hidem', 'true');
                 rowMenu.attr('data-hidem', 'true');
-                rowMenu.attr('data-canca', data.canCA);
-                rowMenu.attr('data-incaing', data.inCAing);
-                rowMenu.attr('data-restype', data.resType);
-
+                rowMenu.attr('data-nature', 'true');//性能趋势
+                // rowMenu.attr('data-canca', data.canCA);
+                // rowMenu.attr('data-incaing', data.inCAing);
+                // rowMenu.attr('data-restype', data.resType);
                 //监听告警压制等操作配置
                 //监听告警压制等操作配置
                 $('#' + targetId + "_detail_row_menu").hover(function () {
                 $('#' + targetId + "_detail_row_menu").hover(function () {
                     var $that = $(this);
                     var $that = $(this);
@@ -3730,14 +3738,21 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             var hideM = $menu.data('hidem');
             var hideM = $menu.data('hidem');
             var canCA = $menu.data('canca');
             var canCA = $menu.data('canca');
             var inCAing = $menu.data('incaing');
             var inCAing = $menu.data('incaing');
-            var menubox = '<div class="detail_menubox" id="detail_menubox_id" style="color:#666;"><ul>' +
-                '<li type="w"><i class="layui-icon">&#xe667;</i>告警设置</li>' +
-                '<li type="s"><i class="layui-icon">&#xe64d;</i>过滤单指标</li>';
+            var nature = $menu.data('nature');
+            var menubox = '<div class="detail_menubox" id="detail_menubox_id" style="color:#666;"><ul>';
+            if (!nature) {
+                menubox +=
+                    '<li type="w"><i class="layui-icon">&#xe667;</i>告警设置</li>' +
+                    '<li type="s"><i class="layui-icon">&#xe64d;</i>过滤单指标</li>';
+            }
             if (!hideM) {
             if (!hideM) {
                 menubox += '<li type="m"><i class="layui-icon">&#xe64d;</i>过滤多指标</li>';
                 menubox += '<li type="m"><i class="layui-icon">&#xe64d;</i>过滤多指标</li>';
             }
             }
-            menubox += '<li type="t"><i class="layui-icon">&#xe62c;</i>性能趋势</li>' +
-                '<li type="n"><i class="layui-icon">&#xe758;</i>压制次数</li>';
+            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 (canCA) {
             if (canCA) {
                 if (inCAing) {
                 if (inCAing) {
                     menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';
                     menubox += '<li type="ca-cancel"><i class="layui-icon">&#xe64d;</i>取消容量预测</li>';