monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit c9ab51a7c7a7faf2ac3a52515ed5090a696a610f 2 parents 157fc35a e621b809

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

宁夏功能迁移



See merge request !700
Inline Side-by-side
Showing 6 changed files with 168 additions and 3 deletions
... ... @@ -4751,6 +4751,28 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
{field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
],
"MIDDLEWARE_TONGWEB": [
{field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
{
field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
templet: '#resindex_resName'
},
{field: 'resTypeName', title: '资源类型', minWidth: x_120, align: 'center'},
{field: 'adminName', title: '负责人', minWidth: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', minWidth: x_140, align: 'center', sort: true},
{field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
{field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', minWidth: x_170, align: 'center', sort: true},
{
field: 'linkState',
title: '连接状态',
align: 'center',
minWidth: x_120,
templet: '#linkStateTpl',
sort: true
}
]
},
/**
* 验证是否跳转详情页
... ...
layui.define(['tree', 'laypage', 'laytpl', 'commonDetail','common'], function (exports) {
var commonDetail = layui.commonDetail;
var common = layui.common;
var admin = layui.admin;
var $ = layui.$;
//对外暴露的接口
exports('middleware_tongweb', function (data) {
var resId = '';
var showFlag = common.getUrlParam("show");
if(showFlag && showFlag == '0'){
resId = common.getUrlParam("resId");
}else{
resId = data.resId;
}
//基本信息
var jbxxKpi = "KPI30D23EF4,KPI0D4FF7D1,KPI899DBD7B,KPID3EBE40F";
//JVM信息
var JVMKpiIds = "KPI52EEAE15,KPIE4E53A03,KPI507E300A,KPI1DC8E10E,KPIFB096A94,KPI49DA0E19";
// 性能信息
var xnxxKpi = "KPI7C4BEB26,KPIB3E7A5C5,KPI2AE83DFC,KPI44DE46D5";
commonDetail.bindTips();
renderPageInfo()
//渲染页面
function renderPageInfo() {
//基本信息
commonDetail.renderText('tongWeb_baseinfo',resId,jbxxKpi);
//性能信息
commonDetail.renderText('tongWeb_xnxxinfo',resId,xnxxKpi);
//cpu使用率
commonDetail.renderGauge("tongWeb_cpurate", resId, "KPI7054BC34", false);
//内存使用率
commonDetail.renderGauge("tongWeb_memeryrate", resId, "KPI31CB8D97", false);
//JVM表格
commonDetail.renderText('tongWeb_JVMinfo',resId,JVMKpiIds);
//CPU使用率走势
commonDetail.renderLineCharat("tongWeb_cpurun",resId,"KPI7054BC34","CPU使用率","");
//内存使用率走势
commonDetail.renderLineCharat("tongWeb_memoryrun",resId,"KPI31CB8D97","内存使用率","");
// 告警信息
commonDetail.renderActiveAlarms('tongWeb_alarmlist', resId)
//JVM堆内存走势
commonDetail.renderLineCharat("tongWeb_heaprun",resId,"KPI6546E739","JVM堆内存走势","");
//JVM非堆内存走势
commonDetail.renderLineCharat("tongWeb_noHeaprun",resId,"KPI89306331","JVM非堆内存走势","");
}
//定时任务
var timer = setInterval(function () {
renderPageInfo()
},commonDetail.timerTime);
commonDetail.detailTimer.push(timer);
});
});
... ...
... ... @@ -27,7 +27,7 @@ layui.define(['commonDetail', 'common'], function (exports) {
//内存使用率走势（12小时）
var memoryRunKpiId = 'KPI31CB8D97';
//端口信息
var portKpiId = 'KPIE9FC78E9,KPI5212EE93,KPI4CBA4D3D,KPI88D5DF44,KPI89560B13,KPI87312ED9,KPIFA92AF2D';
var portKpiId = 'KPIE9FC78E9,KPI5212EE93,KPI4CBA4D3D,KPI88D5DF44,KPI89560B13,KPI87312ED9,KPI7E81DFB5,KPIFA92AF2D';
reload()
//渲染页面
... ...
<!--TONGWEB详细页面-->
<article class="page-container template">
<div class="page-panel">
<div class="main">
<div class="layui-card template_detail_content">
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">基本信息<i data-id="tongWeb_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="tongWeb_baseinfo"></ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">CPU使用率</h5>
<ul id="tongWeb_cpurate" class="pie-wrap dasboard">
<li data-degree="0" class="pie-half pie-half-border-color-3">
<div class="pie-half-text">
<b>0%</b>
<span></span>
</div>
</li>
</ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">内存使用率</h5>
<ul id="tongWeb_memeryrate" class="pie-wrap dasboard">
<li data-degree="0" class="pie-half pie-half-border-color-3">
<div class="pie-half-text">
<b>0%</b>
<span></span>
</div>
</li>
</ul>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">性能信息</h5>
<div class="info-table"id="tongWeb_xnxxinfo"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">JVM信息</h5>
<div class="info-table" id="tongWeb_JVMinfo"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">JVM堆内存走势</h5>
<div id="tongWeb_heaprun" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">JVM非堆内存走势</h5>
<div id="tongWeb_noHeaprun" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">cpu使用率走势</h5>
<div id="tongWeb_cpurun" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">内存使用率走势</h5>
<div id="tongWeb_memoryrun" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="tongWeb_alarmlist"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</article>
<textarea id="middleware_tongweb_param_id" style="display: none;">{{d}}</textarea>
<script>
layui.use('middleware_tongweb', function (fn) {
var $ = layui.$;
var parm = $("#middleware_tongweb_param_id").val();
if(parm.indexOf('{{d') != -1){
fn();
}else{
fn(JSON.parse(parm));
}
});
</script>
... ...
... ... @@ -50,7 +50,7 @@ export default {
return true;
}
let code = '';
let personId = '';
let personId = props.treeNode.parentId;
//点击运维人员或项目
if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code || ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && props.treeNode.map.nodeType.code == "ONE_USER")) {
code = props.docType;
... ...
... ... @@ -331,7 +331,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}
}
}
debugger
if (formWidth + 130 > winWidth) {
$('.openStow').css('display', 'inline-block')
$('.form-item-open-stow').css('height', '50px');
... ...