Authored by 王涛

Merge branch 'master-v32-xwx' into 'master'

杭州-资源视图-采集连接状态



See merge request !395
@@ -228,14 +228,14 @@ @@ -228,14 +228,14 @@
228 <span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span> 228 <span class="red" lay-tips="资源状态:暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>
229 </div> 229 </div>
230 </div> 230 </div>
231 - <div class="info-box-count div-link-state" style="display: none">  
232 - <i></i>  
233 - <label>连接状态</label>  
234 - <div class="num">  
235 - <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>  
237 - </div>  
238 - </div> 231 +<!-- <div class="info-box-count div-link-state" style="display: none">-->
  232 +<!-- <i></i>-->
  233 +<!-- <label>连接状态</label>-->
  234 +<!-- <div class="num">-->
  235 +<!-- <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>-->
  237 +<!-- </div>-->
  238 +<!-- </div>-->
239 <!-- <div class="info-box-count"> 239 <!-- <div class="info-box-count">
240 <i></i> 240 <i></i>
241 <label>即将过保</label> 241 <label>即将过保</label>
@@ -92,15 +92,15 @@ @@ -92,15 +92,15 @@
92 </select> 92 </select>
93 </div> 93 </div>
94 </div> 94 </div>
95 - <div class="layui-inline" id="link_state_div">  
96 - <div class="layui-input-inline">  
97 - <select name="label" id="link_state" lay-filter="link_state">  
98 - <option value="">=连接状态=</option>  
99 - <option value="normal">成功</option>  
100 - <option value="unnormal">失败</option>  
101 - </select>  
102 - </div>  
103 - </div> 95 +<!-- <div class="layui-inline" id="link_state_div">-->
  96 +<!-- <div class="layui-input-inline">-->
  97 +<!-- <select name="label" id="link_state" lay-filter="link_state">-->
  98 +<!-- <option value="">=连接状态=</option>-->
  99 +<!-- <option value="normal">成功</option>-->
  100 +<!-- <option value="unnormal">失败</option>-->
  101 +<!-- </select>-->
  102 +<!-- </div>-->
  103 +<!-- </div>-->
104 <div class="layui-inline" style="display: none" id="host_state_div"> 104 <div class="layui-inline" style="display: none" id="host_state_div">
105 <div class="layui-input-inline"> 105 <div class="layui-input-inline">
106 <select name="label" id="host_state" lay-filter="link_state"> 106 <select name="label" id="host_state" lay-filter="link_state">