monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 5db075476f595c32cd8ee688d0805aa75d364db1 1 parent 1c206328

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

Inline Side-by-side
Showing 4 changed files with 53 additions and 7 deletions
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 <option value="1">中</option> 34 <option value="1">中</option>
35 <option value="2">良</option> 35 <option value="2">良</option>
36 <option value="3">优</option> 36 <option value="3">优</option>
  37 + <option value="none">未监控</option>
37 </select> 38 </select>
38 </div> 39 </div>
39 </div> 40 </div>
@@ -54,6 +55,7 @@ @@ -54,6 +55,7 @@
54 <option value="">=连接状态=</option> 55 <option value="">=连接状态=</option>
55 <option value="normal">成功</option> 56 <option value="normal">成功</option>
56 <option value="unnormal">失败</option> 57 <option value="unnormal">失败</option>
  58 + <option value="9">未监控</option>
57 </select> 59 </select>
58 </div> 60 </div>
59 </div> 61 </div>
@@ -126,6 +128,7 @@ @@ -126,6 +128,7 @@
126 <option value="1">中</option> 128 <option value="1">中</option>
127 <option value="2">良</option> 129 <option value="2">良</option>
128 <option value="3">优</option> 130 <option value="3">优</option>
  131 + <option value="none">未监控</option>
129 </select> 132 </select>
130 </div> 133 </div>
131 </div> 134 </div>
@@ -226,6 +229,17 @@ @@ -226,6 +229,17 @@
226 229
227 <span><i class="layui-badge-dot layui-bg-red"></i>中</span> 230 <span><i class="layui-badge-dot layui-bg-red"></i>中</span>
228 </li> 231 </li>
  232 + <li>
  233 + {{# if(item.healthNone != null){
  234 + if(item.healthNone == '0'){
  235 + }}
  236 + <div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
  237 + {{# } else { }}
  238 + <div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
  239 + {{# } } }}
  240 +
  241 + <span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
  242 + </li>
229 </ul> 243 </ul>
230 </div> 244 </div>
231 </div> 245 </div>
@@ -319,6 +333,7 @@ @@ -319,6 +333,7 @@
319 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_treetable_resStatus" id="tree_normal_biz">0</span>/ 333 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_treetable_resStatus" id="tree_normal_biz">0</span>/
320 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_treetable_resStatus" id="tree_worse_biz">0</span>/ 334 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_treetable_resStatus" id="tree_worse_biz">0</span>/
321 <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_treetable_resStatus" id="tree_worst_biz">0</span> 335 <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_treetable_resStatus" id="tree_worst_biz">0</span>
  336 + <span class="red" lay-tips="健康状态: 未监控" data-value="none" data-target="biz_treetable_resStatus" id="tree_healthNone_biz">0</span>
322 </div> 337 </div>
323 </div> 338 </div>
324 <div class="info-box-count"> 339 <div class="info-box-count">
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 <option value="1">中</option> 28 <option value="1">中</option>
29 <option value="2">良</option> 29 <option value="2">良</option>
30 <option value="3">优</option> 30 <option value="3">优</option>
  31 + <option value="none">未监控</option>
31 </select> 32 </select>
32 </div> 33 </div>
33 </div> 34 </div>
@@ -37,6 +38,7 @@ @@ -37,6 +38,7 @@
37 <option value="">=连接状态=</option> 38 <option value="">=连接状态=</option>
38 <option value="normal">成功</option> 39 <option value="normal">成功</option>
39 <option value="unnormal">失败</option> 40 <option value="unnormal">失败</option>
  41 + <option value="9">未监控</option>
40 </select> 42 </select>
41 </div> 43 </div>
42 </div> 44 </div>
@@ -216,16 +218,17 @@ @@ -216,16 +218,17 @@
216 <div class="num"> 218 <div class="num">
217 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus" data-field="normal">0</span>/ 219 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus" data-field="normal">0</span>/
218 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus" data-field="worse">0</span>/ 220 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus" data-field="worse">0</span>/
219 - <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span> 221 + <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" data-field="worst">0</span>/
  222 + <span class="gray" lay-tips="连接状态：未监控" data-value="none" data-target="biz_reslist_resStatus" data-field="healthNone">0</span>
220 </div> 223 </div>
221 </div> 224 </div>
222 <div class="info-box-count"> 225 <div class="info-box-count">
223 <i></i> 226 <i></i>
224 <label>资源状态</label> 227 <label>资源状态</label>
225 <div class="num"> 228 <div class="num">
226 - <span class="blue" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state" data-field="newstate">0</span>/  
227 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state" data-field="monitorstate">0</span>/ 229 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state" data-field="monitorstate">0</span>/
228 - <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span> 230 + <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>/
  231 + <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state" data-field="newstate">0</span>
229 </div> 232 </div>
230 </div> 233 </div>
231 <div class="info-box-count div-link-state" style="display: none"> 234 <div class="info-box-count div-link-state" style="display: none">
@@ -233,7 +236,8 @@ @@ -233,7 +236,8 @@
233 <label>连接状态</label> 236 <label>连接状态</label>
234 <div class="num"> 237 <div class="num">
235 <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="biz_reslist_link_state" data-field="linksuccess">0</span>/ 238 <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="biz_reslist_link_state" data-field="linksuccess">0</span>/
236 - <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span> 239 + <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state" data-field="linkfail">0</span>/
  240 + <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state" data-field="linkNone">0</span>
237 </div> 241 </div>
238 </div> 242 </div>
239 <!-- <div class="info-box-count"> 243 <!-- <div class="info-box-count">
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
52 <option value="1">中</option> 52 <option value="1">中</option>
53 <option value="2">良</option> 53 <option value="2">良</option>
54 <option value="3">优</option> 54 <option value="3">优</option>
  55 + <option value="none">未监控</option>
55 </select> 56 </select>
56 </div> 57 </div>
57 </div> 58 </div>
@@ -72,6 +73,7 @@ @@ -72,6 +73,7 @@
72 <option value="">=连接状态=</option> 73 <option value="">=连接状态=</option>
73 <option value="normal">成功</option> 74 <option value="normal">成功</option>
74 <option value="unnormal">失败</option> 75 <option value="unnormal">失败</option>
  76 + <option value="9">未监控</option>
75 </select> 77 </select>
76 </div> 78 </div>
77 </div> 79 </div>
@@ -230,6 +232,17 @@ @@ -230,6 +232,17 @@
230 232
231 <span><i class="layui-badge-dot layui-bg-red"></i>中</span> 233 <span><i class="layui-badge-dot layui-bg-red"></i>中</span>
232 </li> 234 </li>
  235 + <li>
  236 + {{# if(item.healthNone != null){
  237 + if(item.healthNone == '0'){
  238 + }}
  239 + <div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
  240 + {{# } else { }}
  241 + <div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
  242 + {{# } } }}
  243 +
  244 + <span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
  245 + </li>
233 </ul> 246 </ul>
234 </div> 247 </div>
235 </div> 248 </div>
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
78 <option value="1">中</option> 78 <option value="1">中</option>
79 <option value="2">良</option> 79 <option value="2">良</option>
80 <option value="3">优</option> 80 <option value="3">优</option>
  81 + <option value="none">未监控</option>
81 </select> 82 </select>
82 </div> 83 </div>
83 </div> 84 </div>
@@ -98,6 +99,7 @@ @@ -98,6 +99,7 @@
98 <option value="">=连接状态=</option> 99 <option value="">=连接状态=</option>
99 <option value="normal">成功</option> 100 <option value="normal">成功</option>
100 <option value="unnormal">失败</option> 101 <option value="unnormal">失败</option>
  102 + <option value="9">未监控</option>
101 </select> 103 </select>
102 </div> 104 </div>
103 </div> 105 </div>
@@ -336,6 +338,17 @@ @@ -336,6 +338,17 @@
336 338
337 <span><i class="layui-badge-dot layui-bg-red"></i>中</span> 339 <span><i class="layui-badge-dot layui-bg-red"></i>中</span>
338 </li> 340 </li>
  341 + <li>
  342 + {{# if(item.healthNone != null){
  343 + if(item.healthNone == '0'){
  344 + }}
  345 + <div><span class="layui-badge layui-bg-gray">{{ item.healthNone }}</span></div>
  346 + {{# } else { }}
  347 + <div><span class="layui-badge" style="background: gray">{{ item.healthNone }}</span></div>
  348 + {{# } } }}
  349 +
  350 + <span><i class="layui-badge-dot" style="background: gray"></i>未监控</span>
  351 + </li>
339 </ul> 352 </ul>
340 </div> 353 </div>
341 </div> 354 </div>
@@ -415,16 +428,17 @@ @@ -415,16 +428,17 @@
415 <div class="num"> 428 <div class="num">
416 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="treetable_resStatus" id="tree_normal_res">0</span>/ 429 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="treetable_resStatus" id="tree_normal_res">0</span>/
417 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="treetable_resStatus" id="tree_worse_res">0</span>/ 430 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="treetable_resStatus" id="tree_worse_res">0</span>/
418 - <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span> 431 + <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="treetable_resStatus" id="tree_worst_res">0</span>/
  432 + <span class="gray" lay-tips="健康状态: 未监控" data-value="1" data-target="treetable_resStatus" id="tree_healthNone_res">0</span>
419 </div> 433 </div>
420 </div> 434 </div>
421 <div class="info-box-count"> 435 <div class="info-box-count">
422 <i></i> 436 <i></i>
423 <label>资源状态</label> 437 <label>资源状态</label>
424 <div class="num"> 438 <div class="num">
425 - <span class="blue" lay-tips="资源状态：未监控" data-value="new" data-target="treetable_res_state" id="tree_newstate_res">0</span>/  
426 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="treetable_res_state" id="tree_monitorstate_res">0</span>/ 439 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="treetable_res_state" id="tree_monitorstate_res">0</span>/
427 - <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span> 440 + <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="treetable_res_state" id="tree_stopstate_res">0</span>/
  441 + <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="treetable_res_state" id="tree_newstate_res">0</span>
428 </div> 442 </div>
429 </div> 443 </div>
430 <!--<div class="info-box-count"> 444 <!--<div class="info-box-count">