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

【799】首页小卡片汇总业务系统和资源类型页面颜色添加计算提示 See merge request !637

Merge branch 'master-500-dev-xwx' into 'master-500-dev'
【799】首页小卡片汇总业务系统和资源类型页面颜色添加计算提示 See merge request !637
王涛
Commit 686401cebf846b802c7761c935c7fe22f7a42f73 2 parents ad5452bb f71c13a3
Showing 2 changed files with 32 additions and 24 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/main-biz-card.js
hg-monitor-web-base/src/main/resources/static/src/views/index-biz-card.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/main-biz-card.js
View file @686401c
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/main-biz-card.js
View file @686401c
@@ -162,6 +162,12 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
                                             // currentBizId = bizlist[0].busId;
                                         }
+                                        $.each(bizlist,function (i,v) {
+                                            if (bizlist[0].title == v.title) {
+                                                $("#"+v.busId).show();
+                                            }
+                                        });
+
                                         //点击业务区域弹出提示框
                                         $('#indexbizhealth [data-index-banner-item="type"]').on("contextmenu", function (e) {
                                             $('[type="t"]').show();
@@ -305,6 +311,29 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
                 $("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
             });
         }
+        var resourceHealthTips ;
+        $(".detail_base_info").hover(function() {
+            openMsg();
+        }, function() {
+            layer.close(resourceHealthTips);
+        });
+        function openMsg() {
+            resourceHealthTips =  layer.tips("<span style='color:#585858;'>" +
+                "按照积分制方式计算业务系统健康状态，即图标颜色：<br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 告警：1个严重告警计10分；1个重要告警计5分；1个一般告警计1分<br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 所有计分累加<br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;起始分为0分，最后得分为计分和；<br>" +
+                "<br>" +
+                "得分与健康状态关系：<br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 0：状态正常，无告警，颜色为<a style='color: #00a522'>绿色</a><br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 大于0且小于等于10：普通问题，最多1个严重告警，颜色为<a style='color: #a4910a'>深黄</a><br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 大于10且小于等于30：一般问题，最多3个严重告警，颜色为<a style='color: #e2c705'>黄色</a><br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 大于30且小于等于50：严重问题，最多5个严重告警，颜色为<a style='color: #ffaf00'>橙色</a><br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 大于50且小于等于100：比较严重，最多10个严重告警，颜色为<a style='color: #f65f0b'>深橙</a><br>" +
+                "&nbsp;&nbsp;&nbsp;&nbsp;• 大于100：非常严重，10个严重告警以上，颜色为<a style='color: #d81e06'>红色<br>" +
+                "</span>",
+                '.detail_base_info',{tips:[2,'#F0F0F0'], time:0,area: ['auto', 'auto']});
+        }
         /**
          * 首页右下角两个功能的时间
@@ -338,29 +367,6 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
             setDefault('select-content-ul',warnVal,'#warn-text-view');
             setDefault('select-content-ul-bus',busVal,'#bus-text-view');
-            var resourceHealthTips ;
-            $("#resource-health-tips").hover(function() {
-                openMsg();
-            }, function() {
-                layer.close(resourceHealthTips);
-            });
-            function openMsg() {
-                resourceHealthTips =  layer.tips("<span style='color:#585858;'>" +
-                    "按照积分制方式计算健康状态，即图标颜色：<br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 告警：1个严重告警计10分；1个重要告警计5分；1个一般告警计1分<br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 所有计分累加<br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;起始分为0分，最后得分为计分和；<br>" +
-                    "<br>" +
-                    "得分与健康状态关系：<br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 0：状态正常，无告警，颜色为<a style='color: #00a522'>绿色</a><br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 大于0且小于等于10：普通问题，最多1个严重告警，颜色为<a style='color: #a4910a'>深黄</a><br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 大于10且小于等于30：一般问题，最多3个严重告警，颜色为<a style='color: #e2c705'>黄色</a><br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 大于30且小于等于50：严重问题，最多5个严重告警，颜色为<a style='color: #ffaf00'>橙色</a><br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 大于50且小于等于100：比较严重，最多10个严重告警，颜色为<a style='color: #f65f0b'>深橙</a><br>" +
-                    "&nbsp;&nbsp;&nbsp;&nbsp;• 大于100：非常严重，10个严重告警以上，颜色为<a style='color: #d81e06'>红色<br>" +
-                    "</span>",
-                    '#resource-health-tips',{tips:[2,'#F0F0F0'], time:0,area: ['auto', 'auto']});
-            }
             // Start 告警级别默认为严重告警，点击左下角选择告警级别，页面的小红点切换不同告警的数量，item根据告警数量进行排序 LSQ 2021/12/29 19:37
             $(".select-serious").hide();
--- a/hg-monitor-web-base/src/main/resources/static/src/views/index-biz-card.html
View file @686401c
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/index-biz-card.html
View file @686401c
@@ -293,8 +293,10 @@
                 <div class="index-banner-title">
                     <i class="{{bizClas}}"></i>
-                    <span><a id="resource-health-tips" style="color: #01AAED;">{{item.title}}</a><a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}" data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px" lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></span>
+                    <span>{{item.title}}<a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}" data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px" lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></span>
                     <div class="index-banner-title-desc"><span>{{item.countTxt}}</span></div>
+                    <i id="{{item.busId}}" class="iconfont detail_base_info" style="color:rgb(30,159,255);display: none;">&#xe61e;</i>
+
                 </div>
                 <div class="index-banner-group-list">
                     {{# layui.each(item.bizList, function(index, item){ }}