monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 8043b745f87d10e9795d9c3c039dd6d58bc6d292 2 parents 228cf586 7490b6d0

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 17 additions and 1 deletions
@@ -645,6 +645,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',' @@ -645,6 +645,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload','
645 } else { 645 } else {
646 clearInterval(timeTask); 646 clearInterval(timeTask);
647 layer.confirm(response.msg, {icon: 1, offset: '100px'}); 647 layer.confirm(response.msg, {icon: 1, offset: '100px'});
  648 + reloadCollectorTable();
648 resetBtn(); 649 resetBtn();
649 } 650 }
650 } else { 651 } else {
@@ -728,7 +728,7 @@ @@ -728,7 +728,7 @@
728 {{# 728 {{#
729 var linkStateHtml = ''; 729 var linkStateHtml = '';
730 var linkStateTips = '无连接信息'; 730 var linkStateTips = '无连接信息';
731 - if(d.linkStateList && d.linkStateList.length >=0 ) { 731 + if(d.linkStateList && d.linkStateList.length >=0 && d.resType !== 'MIDDLEWARE_WEBLOGIC') {
732 linkStateTips = ''; 732 linkStateTips = '';
733 if(d.linkStateList.length == 1) { 733 if(d.linkStateList.length == 1) {
734 var linkState = d.linkStateList[0]; 734 var linkState = d.linkStateList[0];
@@ -779,6 +779,21 @@ @@ -779,6 +779,21 @@
779 linkStateTips += '</ul>'; 779 linkStateTips += '</ul>';
780 } 780 }
781 } 781 }
  782 + }else{
  783 + /*对于中间件weblogic来讲，只有控制台有连接状态指标，服务的连接状态是服务对应的服务状态指标，此列表中只展示所有weblogic的服务信息，所以这里直接取视图中的monitorState字段作为连接状态*/
  784 + linkStateTips='连接成功';
  785 + if(d.linkState.indexOf('成功') !== -1) {
  786 + linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
  787 + } else {
  788 + linkStateHtml = `<button type="button"
  789 + id="${d.resId}_bizdanger"
  790 + data-message="${d.message}"
  791 + data-state="${d.state}"
  792 + data-id="${d.resId}_bizdanger"
  793 + class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
  794 + 失败
  795 + </button>`;
  796 + }
782 } 797 }
783 }} 798 }}
784 <div class="div-link-state-list" lay-tips="{{linkStateTips}}"> 799 <div class="div-link-state-list" lay-tips="{{linkStateTips}}">