【禅道#679】资源视图未监控的资源健康度和连接状态都默认为中和失败

xwx
Commit 779ef9a8468f18f51917c861dd12412e1c42d3d1 1 parent 854edd1f
Showing 4 changed files with 35 additions and 20 deletions
hg-monitor-web-base/src/main/resources/static/src/views/biz/index.html
hg-monitor-web-base/src/main/resources/static/src/views/domain/index.html
hg-monitor-web-base/src/main/resources/static/src/views/res/index.html
hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
--- a/hg-monitor-web-base/src/main/resources/static/src/views/biz/index.html
View file @779ef9a
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/biz/index.html
View file @779ef9a
@@ -268,16 +268,18 @@
             <div class="num">
                 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_resStatus" id="normal_biz">0</span>/
                 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_resStatus" id="worse_biz">0</span>/
-                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_resStatus" id="worst_biz">0</span>
+                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_resStatus" id="worst_biz">0</span>/
+                <span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="biz_resStatus" id="healthNone_biz">0</span>
             </div>
         </div>
         <div class="info-box-count">
             <i></i>
             <label>资源状态</label>
             <div class="num">
-                <span class="blue" lay-tips="资源状态：未监控" data-value="new" data-target="biz_state" id="newstate_biz">0</span>/
                 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_state" id="monitorstate_biz">0</span>/
-                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_state" id="stopstate_biz">0</span>
+                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_state" id="stopstate_biz">0</span>/
+                <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_state" id="newstate_biz">0</span>
+
             </div>
         </div>
         <div class="info-box-count">
@@ -285,7 +287,8 @@
             <label>连接状态</label>
             <div class="num">
                 <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="bizlink_state" id="linksuccess_biz">0</span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="bizlink_state" id="linkfail_biz">0</span>
+                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="bizlink_state" id="linkfail_biz">0</span>/
+                <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state" id="linkNone_biz">0</span>
             </div>
         </div>
         <!-- <div class="info-box-count">
--- a/hg-monitor-web-base/src/main/resources/static/src/views/domain/index.html
View file @779ef9a
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/domain/index.html
View file @779ef9a
@@ -431,16 +431,18 @@
             <div class="num">
                 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="domain_resStatus" id="normal_domain"></span>/
                 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="domain_resStatus" id="worse_domain"></span>/
-                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="domain_resStatus" id="worst_domain"></span>
+                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="domain_resStatus" id="worst_domain"></span>/
+                <span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="domain_resStatus" id="healthNone_domain">0</span>
             </div>
         </div>
         <div class="info-box-count">
             <i></i>
             <label>资源状态</label>
             <div class="num">
-                <span class="blue" lay-tips="资源状态：未监控" data-value="new" data-target="domain_state" id="newstate_domain"></span>/
                 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="domain_state" id="monitorstate_domain"></span>/
-                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="domain_state" id="stopstate_domain"></span>
+                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="domain_state" id="stopstate_domain"></span>/
+                <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="domain_state" id="newstate_domain"></span>
+
             </div>
         </div>
         <div class="info-box-count">
@@ -448,7 +450,8 @@
             <label>连接状态</label>
             <div class="num">
                 <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="domainlink_state" id="linksuccess_domain"></span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="domainlink_state" id="linkfail_domain"></span>
+                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="domainlink_state" id="linkfail_domain"></span>/
+                <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="domainlink_state" id="linkNone_domain">0</span>
             </div>
         </div>
         <!--          <div class="info-box-count">
--- a/hg-monitor-web-base/src/main/resources/static/src/views/res/index.html
View file @779ef9a
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/res/index.html
View file @779ef9a
@@ -365,16 +365,18 @@
             <div class="num">
                 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="resStatus " id="normal_res">0</span>/
                 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="resStatus" id="worse_res">0</span>/
-                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="resStatus" id="worst_res">0</span>
+                <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="resStatus" id="worst_res">0</span>/
+                <span class="gray" lay-tips="健康状态: 未监控" data-value="none" data-target="resStatus" id="healthNone_res">0</span>
             </div>
         </div>
         <div class="info-box-count">
             <i></i>
             <label>资源状态</label>
             <div class="num">
-                <span class="blue" lay-tips="资源状态：未监控" data-value="new" data-target="state" id="newstate_res">0</span>/
+
                 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="state" id="monitorstate_res">0</span>/
-                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="state" id="stopstate_res">0</span>
+                <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="state" id="stopstate_res">0</span>/
+                <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="state" id="newstate_res">0</span>
             </div>
         </div>
         <div class="info-box-count">
@@ -382,7 +384,8 @@
             <label>连接状态</label>
             <div class="num">
                 <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="link_state" id="linksuccess_res">0</span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="link_state" id="linkfail_res">0</span>
+                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="link_state" id="linkfail_res">0</span>/
+                <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state" id="linkNone_res">0</span>
             </div>
         </div>
         <!--          <div class="info-box-count">
--- a/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
View file @779ef9a
+++ b/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html
View file @779ef9a
@@ -753,15 +753,18 @@
                 if(d.hostState == 'active' || d.hostState == 'connected' || d.hostState == '正常' ){
                     linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
                     linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接成功</li>`;
-            }else{
+                }else if(d.hostState == '' && d.linkState == '未监控'){
+                    linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">未监控</button>';
+                    linkStateTips += `<li class='li-link-state-tips-red'>未监控</li>`;
+                }else {
                     linkStateHtml = `<button type="button"
-                         id="${d.resId}_bizdanger"
-                         data-message="${d.message}"
-                         data-state="${d.state}"
-                         data-id="${d.resId}_bizdanger"
-                         class="layui-btn  layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
+                                             id="${d.resId}_bizdanger"
+                                             data-message="${d.message}"
+                                             data-state="${d.state}"
+                                             data-id="${d.resId}_bizdanger"
+                                             class="layui-btn  layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
                         失败
-                        </button>`;
+                    </button>`;
                     if(d.hostState!=''){
                         linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接失败</li>`;
                     }else{
@@ -875,6 +878,9 @@
     {{#  if(d.health === '3'){ }}
     <button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">优</button>
     {{#  } }}
+    {{#  if(d.health === 'none'){ }}
+    <button type="button" class="layui-btn layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">未监控</button>
+    {{#  } }}
 </script>
 <!--主机状态-->
 <script type="text/html" id="hostStateTpl">
@@ -915,7 +921,7 @@
     {{#
     switch (d.state) {
     case "new" :
-    }} <button type="button" class="layui-btn layui-btn-warm layui-bg-blue layui-btn-radius layui-btn-xs p-0-15 cant-click">未监控</button> {{#
+    }} <button type="button" class="layui-btn layui-btn-warm layui-bg-gray layui-btn-radius layui-btn-xs p-0-15 cant-click">未监控</button> {{#
     break;
     case "monitor" :
     }} <button type="button" class="layui-btn layui-btn-warm layui-bg-green layui-btn-radius layui-btn-xs p-0-15 cant-click">监控中</button> {{#