monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 11a61fe73a2724cb4af6285947eaba7df9c13c0e 2 parents 97f18a82 a6129a1f

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

资源视图未监控的资源_健康度和连接状态都默认为中和失败 2#



See merge request !625
Inline Side-by-side
Showing 4 changed files with 53 additions and 7 deletions
... ... @@ -34,6 +34,7 @@
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -54,6 +55,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -126,6 +128,7 @@
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -226,6 +229,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ... @@ -319,6 +333,7 @@
<span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_treetable_resStatus" id="tree_normal_biz">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_treetable_resStatus" id="tree_worse_biz">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_treetable_resStatus" id="tree_worst_biz">0</span>
<span class="red" lay-tips="健康状态: 未监控" data-value="none" data-target="biz_treetable_resStatus" id="tree_healthNone_biz">0</span>
</div>
</div>
<div class="info-box-count">
... ...
... ... @@ -28,6 +28,7 @@
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -37,6 +38,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -216,16 +218,17 @@
<div class="num">
<span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus" data-field="normal">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus" data-field="worse">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span>/
<span class="gray" lay-tips="连接状态：未监控" data-value="none" data-target="biz_reslist_resStatus" data-field="healthNone">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_reslist_state" data-field="newstate">0</span>/
<span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state" data-field="monitorstate">0</span>/
<span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>
<span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>/
<span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state" data-field="newstate">0</span>
</div>
</div>
<div class="info-box-count div-link-state" style="display: none">
... ... @@ -233,7 +236,8 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="biz_reslist_link_state" data-field="linksuccess">0</span>/
<span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span>
<span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span>/
<span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state" data-field="linkNone">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ...
... ... @@ -52,6 +52,7 @@
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -72,6 +73,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -230,6 +232,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ...
... ... @@ -78,6 +78,7 @@
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
<option value="none">未监控</option>
</select>
</div>
</div>
... ... @@ -98,6 +99,7 @@
<option value="">=连接状态=</option>
<option value="normal">成功</option>
<option value="unnormal">失败</option>
<option value="9">未监控</option>
</select>
</div>
</div>
... ... @@ -336,6 +338,17 @@
<span><i class="layui-badge-dot layui-bg-red"></i>中</span>
</li>
<li>
{{# if(item.healthNone != null){
if(item.healthNone == '0'){
}}
<div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
{{# } else { }}
<div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
{{# } } }}
<span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
</li>
</ul>
</div>
</div>
... ... @@ -415,16 +428,17 @@
<div class="num">
<span class="green" lay-tips="健康状态：优" data-value="3" data-target="treetable_resStatus" id="tree_normal_res">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="treetable_resStatus" id="tree_worse_res">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span>
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span>/
<span class="gray" lay-tips="健康状态: 未监控" data-value="1" data-target="treetable_resStatus" id="tree_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="treetable_res_state" id="tree_newstate_res">0</span>/
<span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="treetable_res_state" id="tree_monitorstate_res">0</span>/
<span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span>
<span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span>/
<span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="treetable_res_state" id="tree_newstate_res">0</span>
</div>
</div>
<!--<div class="info-box-count">
... ...