monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit aa207722b01f53a2694ab5f3d7401b44d230ea59 2 parents cc0ebb23 54058ab3

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 13 changed files with 67 additions and 41 deletions
@@ -24,6 +24,8 @@ layui.define(['commonDetail','common'], function (exports) { @@ -24,6 +24,8 @@ layui.define(['commonDetail','common'], function (exports) {
24 var xnxxKpi = "KPIE2174352,KPIC0A94965"; 24 var xnxxKpi = "KPIE2174352,KPIC0A94965";
25 //运行状态信息 25 //运行状态信息
26 var yxztxx = "KPIE4B51D5C,KPI7F91F142"; 26 var yxztxx = "KPIE4B51D5C,KPI7F91F142";
  27 + //配置信息
  28 + var pzxx = "";
27 29
28 reload() 30 reload()
29 31
@@ -36,7 +38,9 @@ layui.define(['commonDetail','common'], function (exports) { @@ -36,7 +38,9 @@ layui.define(['commonDetail','common'], function (exports) {
36 // 屏蔽KPI3B6A0393（连接数使用率），增加KPIC0A94965（已打开会话数） 38 // 屏蔽KPI3B6A0393（连接数使用率），增加KPIC0A94965（已打开会话数）
37 commonDetail.renderText("ali_cloud_rds_xnxxinfo",resId,xnxxKpi); 39 commonDetail.renderText("ali_cloud_rds_xnxxinfo",resId,xnxxKpi);
38 //运行状态信息 40 //运行状态信息
39 - commonDetail.renderText("ali_cloud_rds_yxztinfo",resId,yxztxx); 41 + commonDetail.renderText("ali_cloud_rds_linkinfo",resId,yxztxx);
  42 + //配置信息
  43 + commonDetail.renderText("ali_cloud_rds_setinfo",resId,pzxx);
40 // CPU使用率 44 // CPU使用率
41 commonDetail.renderGauge("ali_cloud_rds_cpu_rate",resId,"KPI7054BC34"); 45 commonDetail.renderGauge("ali_cloud_rds_cpu_rate",resId,"KPI7054BC34");
42 // 内存使用率 46 // 内存使用率
@@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
758 showFolderIcon: true, 758 showFolderIcon: true,
759 showLine: true, 759 showLine: true,
760 indent: 20, 760 indent: 20,
761 - expandedKeys: [-3], 761 + expandedKeys: true,
762 strict: false 762 strict: false
763 }, 763 },
764 data: data 764 data: data
@@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
914 var sessions = layui.sessions; 914 var sessions = layui.sessions;
915 accessToken = sessions.getToken()['access_token']; 915 accessToken = sessions.getToken()['access_token'];
916 }); 916 });
917 - var parseData=JSON.parse(data['cols']);  
918 - var cols = parseData[0]; 917 + var cols = data['cols'][0];
919 $.each(cols, function (i, e) { 918 $.each(cols, function (i, e) {
920 if (e['isChild']) { 919 if (e['isChild']) {
921 if (e['isChild'] && typeof e['isChild'] === 'function') { 920 if (e['isChild'] && typeof e['isChild'] === 'function') {
@@ -366,37 +366,37 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -366,37 +366,37 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
366 "HUAWEI_CLOUD_PHYSICSHOST": [ 366 "HUAWEI_CLOUD_PHYSICSHOST": [
367 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 367 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
368 { 368 {
369 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 369 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
370 templet: '#resindex_resName' 370 templet: '#resindex_resName'
371 }, 371 },
372 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 372 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
373 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 373 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
374 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 374 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
375 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
376 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
377 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
378 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
379 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
380 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 375 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  376 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  377 + {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
  378 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  379 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  380 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
381 // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态 381 // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
382 {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true} 382 {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true}
383 ], 383 ],
384 "HUAWEI_CLOUD_VIRTUALHOST": [ 384 "HUAWEI_CLOUD_VIRTUALHOST": [
385 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 385 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
386 { 386 {
387 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 387 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
388 templet: '#resindex_resName' 388 templet: '#resindex_resName'
389 }, 389 },
390 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 390 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
391 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 391 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
392 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 392 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
393 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
394 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
395 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
396 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
397 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
398 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
399 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 393 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  394 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  395 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  396 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  397 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  398 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  399 + {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
400 ], 400 ],
401 "HUAWEI_CLOUD_STORAGE": [ 401 "HUAWEI_CLOUD_STORAGE": [
402 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 402 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3159 showFolderIcon: true, 3159 showFolderIcon: true,
3160 showLine: true, 3160 showLine: true,
3161 indent: 20, 3161 indent: 20,
3162 - expandedKeys: [-3], 3162 + expandedKeys: true,
3163 strict: false 3163 strict: false
3164 }, 3164 },
3165 data: response.data, 3165 data: response.data,
@@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
1618 showFolderIcon: true, 1618 showFolderIcon: true,
1619 showLine: true, 1619 showLine: true,
1620 indent: 20, 1620 indent: 20,
1621 - expandedKeys: [-3], 1621 + expandedKeys: true,
1622 strict: false 1622 strict: false
1623 }, 1623 },
1624 data: data 1624 data: data
@@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports @@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
210 showFolderIcon: true, 210 showFolderIcon: true,
211 showLine: true, 211 showLine: true,
212 indent: 20, 212 indent: 20,
213 - expandedKeys: [-3], 213 + expandedKeys: true,
214 strict: false 214 strict: false
215 }, 215 },
216 data: data 216 data: data
@@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
950 showFolderIcon: true, 950 showFolderIcon: true,
951 showLine: true, 951 showLine: true,
952 indent: 20, 952 indent: 20,
953 - expandedKeys: [-3], 953 + expandedKeys: true,
954 strict: false 954 strict: false
955 }, 955 },
956 data: data 956 data: data
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
195 type: 'text' 195 type: 'text'
196 } 196 }
197 }, 197 },
198 - height: 'auto', 198 + height: '200px',
199 data: resTypeTree, 199 data: resTypeTree,
200 on: function (data) { 200 on: function (data) {
201 if(data.isAdd){ 201 if(data.isAdd){
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <li class="layui-nav-item" > 58 <li class="layui-nav-item" >
59 59
60 <div id="toYTHView_div" > 60 <div id="toYTHView_div" >
61 - <dd layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd> 61 + <dd layadmin-event="toYTHViewScreen" title="一体化监控台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd>
62 </div> 62 </div>
63 </li> 63 </li>
64 64
@@ -724,7 +724,7 @@ @@ -724,7 +724,7 @@
724 {{# 724 {{#
725 var linkStateHtml = ''; 725 var linkStateHtml = '';
726 var linkStateTips = '无连接信息'; 726 var linkStateTips = '无连接信息';
727 - if(d.linkStateList && d.linkStateList.length) { 727 + if(d.linkStateList && d.linkStateList.length >=0 ) {
728 linkStateTips = ''; 728 linkStateTips = '';
729 if(d.linkStateList.length == 1) { 729 if(d.linkStateList.length == 1) {
730 var linkState = d.linkStateList[0]; 730 var linkState = d.linkStateList[0];
@@ -737,22 +737,43 @@ @@ -737,22 +737,43 @@
737 data-message="${d.message}" 737 data-message="${d.message}"
738 data-state="${d.state}" 738 data-state="${d.state}"
739 data-id="${d.resId}_bizdanger" 739 data-id="${d.resId}_bizdanger"
740 - class="layui-btn showTip layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click"> 740 + class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
741 失败 741 失败
742 </button>`; 742 </button>`;
743 } 743 }
744 } else { 744 } else {
745 - linkStateTips += `<ul class='ul-link-state-tips'>`;  
746 - layui.each(d.linkStateList, function(index, value) {  
747 - if(value.state.indexOf('成功') !== -1) {  
748 - linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`;  
749 - linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>';  
750 - } else {  
751 - linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`;  
752 - linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>'; 745 + if(d.linkStateList.length == 0){
  746 + if(d.hostState == 'active' || d.hostState == 'connected' || d.hostState == '正常' ){
  747 + linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
  748 + linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接成功</li>`;
  749 + }else{
  750 + linkStateHtml = `<button type="button"
  751 + id="${d.resId}_bizdanger"
  752 + data-message="${d.message}"
  753 + data-state="${d.state}"
  754 + data-id="${d.resId}_bizdanger"
  755 + class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
  756 + 失败
  757 + </button>`;
  758 + if(d.hostState!=''){
  759 + linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接失败</li>`;
  760 + }else{
  761 + linkStateTips += `<li class='li-link-state-tips-red'>ssh: 连接失败</li>`;
  762 + }
753 } 763 }
754 - });  
755 - linkStateTips += '</ul>'; 764 + }else{
  765 + linkStateTips += `<ul class='ul-link-state-tips'>`;
  766 + layui.each(d.linkStateList, function(index, value) {
  767 + if(value.state.indexOf('成功') !== -1) {
  768 + linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`;
  769 + linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>';
  770 + } else {
  771 + linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`;
  772 + linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>';
  773 + }
  774 + });
  775 + linkStateTips += '</ul>';
  776 + }
756 } 777 }
757 } 778 }
758 }} 779 }}
1 <div class="analysis-add-container"> 1 <div class="analysis-add-container">
2 - <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7"> 2 + <div class="add-top-title" style=" padding: 20px 20px 0px 20px;font-weight: bold">
3 比对分析场景 3 比对分析场景
4 </div> 4 </div>
5 <div class="analysis-drop" v-if="!isShowLIst"> 5 <div class="analysis-drop" v-if="!isShowLIst">
@@ -132,7 +132,8 @@ export default { @@ -132,7 +132,8 @@ export default {
132 132
133 if (this.$route.query.msgKey){ 133 if (this.$route.query.msgKey){
134 document.getElementById("goDP").style.display="block" 134 document.getElementById("goDP").style.display="block"
135 - } 135 + };
  136 + document.title = '电子税务局大屏';
136 }, 137 },
137 unmounted () { 138 unmounted () {
138 window.removeEventListener('resize', this.screenAdapter) 139 window.removeEventListener('resize', this.screenAdapter)
@@ -59,6 +59,7 @@ export default { @@ -59,6 +59,7 @@ export default {
59 setInterval(function(){ 59 setInterval(function(){
60 getDateTime(); 60 getDateTime();
61 },1000); 61 },1000);
  62 + document.title = '监控一体化视图'
62 63
63 }) 64 })
64 let getDateTime=()=>{ 65 let getDateTime=()=>{