monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 98eb852ee1168b65b8192eea47f832231a31e167 2 parents 853ac3af f7a0656d

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

Inline Side-by-side
Showing 12 changed files with 53 additions and 12 deletions
... ... @@ -334,7 +334,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: 250, sort: true,
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
{field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
{field: 'storageSetRate', title: '存储分配率', align: 'center', minWidth: 120, templet: '#storageSetRateTpl'},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -349,7 +351,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: 250, sort: true,
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
{field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -365,6 +368,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -380,6 +385,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -395,6 +402,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -410,6 +419,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -425,6 +436,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ... @@ -440,6 +453,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
... ...
... ... @@ -46,6 +46,8 @@ layui.define(['admin', 'table', 'common','sessions','commonDetail'], function (e
$("#hostminicomputer_jbxx").html(li);
}
});
//活动告警
commonDetail.renderActiveAlarms('hostminicomputer_alarmlist',resId);
// 小型机分区信息
table.render({
... ...
... ... @@ -66,7 +66,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
{title: '序号', align: "center", type: 'numbers',width: '3%'}
, {field: 'type', title: '通知类型', align: 'center', sort: true, width:130,
templet: function (d){
switch (d.type){
if(d.type) {
switch (d.type) {
case 10:
return '告警通知'
break;
... ... @@ -82,7 +83,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
case 99:
return '测试通知'
break;
default:
return '告警通知'
break;
}
}else {
return '告警通知'
}
}}
, {field: 'way', title: '通知方式', align: 'center', sort: true, width:120,
templet: function (d){
... ... @@ -96,10 +103,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
case 'message':
return '<div class="small-icon small-icon-msg"></div>'
break;
default:
return '<div class="small-icon small-icon-wechat"></div>'
break;
}
}}
// , {field: 'targetId', title: '通知对象', align: 'center', sort: true, width:180}
, {field: 'content', title: '通知内容', align: 'right', sort: true, minWidth: 300,}
, {field: 'content', title: '通知内容', align: 'left', sort: true, minWidth: 300,}
, {field: 'nickname', title: '通知用户', align: 'center', sort: true, width:200}
, {field: 'noticeTime', title: '通知时间', align: 'center', sort: true, width:180}
// , {field: 'createTime',title: '入库时间',align: 'center', sort: true,width:180}
... ...
... ... @@ -23,6 +23,12 @@
<div id="hostminicomputerpartitionlist"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="hostminicomputer_alarmlist"></div>
</div>
</div>
</div>
</div>
</div>
... ...
... ... @@ -66,10 +66,10 @@
margin-left:20px;
}
.sjzx .item ul li .icon-wd {
background-image: url('/vue3/src/assets/images/zjdp/icon-wd.png');
background-image: url('/vue3/src/assets/images/zjdp/icon-machine.png');
}
.sjzx .item ul li .icon-sd {
background-image: url("/vue3/src/assets/images/zjdp/icon-sd.png");
background-image: url("/vue3/src/assets/images/zjdp/icon-ass.png");
}
.sjzx .item ul li .icon-mj {
background-image: url("/vue3/src/assets/images/zjdp/icon-mj.png");
... ...
... ... @@ -52,8 +52,12 @@
background-color: #112a72;
}
.nullDiv{
width:20%;
padding: 0px 8px;
padding:0px 53px;
font-size: 16px;
box-sizing: border-box;
height: 40px;
align-items: center;
display: flex;
}
.navTabs-card .el-carousel__item--card{
width:20%;
... ...
... ... @@ -12,7 +12,7 @@ export default {
domainName:sessionStorage.getItem('domainName'),
apiUrl:'/api-web/sxview/getBusinessAvailability',
kpiIds:'KPI97B835A4,KPIFE85BE59,KPI7A29BAC3,KPIE7A7E3E4',
busId: '385773d9f6314aac8756cf2b98ec0190',
busId: '53bebbd79f384f619513b50666ea1d48',
performanceData:'',
xAxisData:'',
yAxisData:'',
... ... @@ -258,7 +258,7 @@ export default {
interval:(100-0)/5
},
{
name: '单位:万',
name: '单位:个',
type: 'value',
axisLabel: {
show: true,
... ...
... ... @@ -13,8 +13,9 @@
<el-carousel-item v-for="(item,index) in listItem" :key="item" >
<div class="tabContaier">
<div @click="clickTabs(itemData.busId)" v-if="listArray" v-for="(itemData,index) in dataShow" :class="['tabItem', {'active':checkId==itemData.busId,'borderColorGood':itemData.healthStatus==2,'borderColorMi':itemData.healthStatus==1}]">{{itemData.busTypeName}}</div>
<div v-for="i in isDiv" class="nullDiv" ></div>
</div>
<div v-for="i in isDiv" class="nullDiv" ></div>
</el-carousel-item>
... ...
... ... @@ -260,7 +260,7 @@ export default {
interval:(100-0)/10
},
{
name: '单位:万',
name: '单位:个',
type: 'value',
axisLabel: {
show: true,
... ...