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

中间件weblogic连接状态优化



See merge request !498

@@ -645,6 +645,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload','
                                         } else {
                                         } else {
                                             clearInterval(timeTask);
                                             clearInterval(timeTask);
                                             layer.confirm(response.msg, {icon: 1, offset: '100px'});
                                             layer.confirm(response.msg, {icon: 1, offset: '100px'});
+                                            reloadCollectorTable();
                                             resetBtn();
                                             resetBtn();
                                         }
                                         }
                                     } else {
                                     } else {

@@ -728,7 +728,7 @@
 {{#
 {{#
     var linkStateHtml = '';
     var linkStateHtml = '';
     var linkStateTips = '无连接信息';
     var linkStateTips = '无连接信息';
-    if(d.linkStateList && d.linkStateList.length >=0 ) {
+    if(d.linkStateList && d.linkStateList.length >=0 && d.resType !== 'MIDDLEWARE_WEBLOGIC') {
         linkStateTips = '';
         linkStateTips = '';
         if(d.linkStateList.length == 1) {
         if(d.linkStateList.length == 1) {
             var linkState = d.linkStateList[0];
             var linkState = d.linkStateList[0];
@@ -779,6 +779,21 @@
                 linkStateTips += '</ul>';
                 linkStateTips += '</ul>';
             }
             }
         }
         }
+    }else{
+        /*对于中间件weblogic来讲，只有控制台有连接状态指标，服务的连接状态是服务对应的服务状态指标，此列表中只展示所有weblogic的服务信息，所以这里直接取视图中的monitorState字段作为连接状态*/
+        linkStateTips='连接成功';
+        if(d.linkState.indexOf('成功') !== -1) {
+            linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
+        } 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">
+                            失败
+                            </button>`;
+        }
     }
     }
 }}
 }}
     <div class="div-link-state-list" lay-tips="{{linkStateTips}}">
     <div class="div-link-state-list" lay-tips="{{linkStateTips}}">