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

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



See merge request !396

@@ -228,14 +228,14 @@
                 <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" data-field="stopstate">0</span>
             </div>
         </div>
-<!--        <div class="info-box-count div-link-state" style="display: none">-->
-<!--            <i></i>-->
-<!--            <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>-->
-<!--            </div>-->
-<!--        </div>-->
+        <div class="info-box-count div-link-state" style="display: none">
+            <i></i>
+            <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>
+            </div>
+        </div>
         <!--          <div class="info-box-count">
                       <i></i>
                       <label>即将过保</label>

@@ -92,15 +92,15 @@
                                         </select>
                                     </div>
                                 </div>
-<!--                                <div class="layui-inline" id="link_state_div">-->
-<!--                                    <div class="layui-input-inline">-->
-<!--                                        <select name="label" id="link_state" lay-filter="link_state">-->
-<!--                                            <option value="">=连接状态=</option>-->
-<!--                                            <option value="normal">成功</option>-->
-<!--                                            <option value="unnormal">失败</option>-->
-<!--                                        </select>-->
-<!--                                    </div>-->
-<!--                                </div>-->
+                                <div class="layui-inline" id="link_state_div">
+                                    <div class="layui-input-inline">
+                                        <select name="label" id="link_state" lay-filter="link_state">
+                                            <option value="">=连接状态=</option>
+                                            <option value="normal">成功</option>
+                                            <option value="unnormal">失败</option>
+                                        </select>
+                                    </div>
+                                </div>
                                 <div class="layui-inline" style="display: none" id="host_state_div">
                                     <div class="layui-input-inline">
                                         <select name="label" id="host_state" lay-filter="link_state">

@@ -1442,7 +1442,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             });
             if(resType == 'HOST_MINICOMPUTER' || resType=='HUAWEI_CLOUD_CLUSTER' || resType=='HUAWEI_CLOUD_COLONY' || resType=='HUAWEI_CLOUD_PHYSICSHOST' ||
                 resType == 'HUAWEI_CLOUD_STORAGE' || resType == 'HUAWEI_CLOUD_SWITCHBOARD' || resType == 'HUAWEI_CLOUD_FIREWALL' || resType == 'ALI_CLOUD_RDS'
-                || resType == 'ALI_CLOUD_SLB' || resType == 'ALI_CLOUD_OSS'
+                || resType == 'ALI_CLOUD_SLB' || resType == 'ALI_CLOUD_OSS'||resType=='VIRTUALIZATION_VMWARE_VHOST'||resType=='MIDDLEWARE_WEBLOGIC'
             ){//小型机整机 屏蔽连接状态
                 $('.info-box-count').eq(3).hide();
             }