monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit c9c45f56f826631d844bc3b760cfa21def8c0211 2 parents a61850ae 253378c2

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

…eb into master-500-dev-xwx

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail.js
	hg-monitor-web-base/src/main/resources/static/src/views/template/detail/snapshot_detail.html
Inline Side-by-side
Showing 7 changed files with 152 additions and 6 deletions
... ... @@ -6,6 +6,9 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
exports('snapshot_detail', function (data) {
var common = layui.common;
var sessions = layui.sessions;
var table = layui.table;
var view = layui.view;
var laytpl = layui.laytpl;
var resId = '';
var batchNo = '';
var showFlag = common.getUrlParam("show");
... ... @@ -16,8 +19,12 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
resId = data.resId;
batchNo = data.batchNo;
}
// 删除所有的子元素
$('#table_arr_body').empty();
findAllSnapshot();
// commonDetail.bindTips();
function findAllSnapshot() {
let url = common.domainName + '/api-web/snapshot/info?resId='+ resId + '&batchNo='+batchNo +'&access_token='+sessions.getToken().access_token;
... ... @@ -37,7 +44,81 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
$("#hostminicomputerpartition_sysfile").html('<div style="text-align:center;"><i style="line-height: 150px; padding:20px;font-style:normal;">暂无数据</i></div>')
}
commonDetail.snapshotRenderActiveAlarms("告警列表","snapshow_active_alram", res.object.snapshotAlamList);
console.log(res.object.snapshotRecordList);
let tableArr = res.object.snapshotRecordList;
let domTableArr='';
// 渲染生成节点
tableArr.forEach((item,index)=>{
domTableArr+=`
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">${item.name}
<span class="layui-table-link" id="snapshot_wkinfoDownload_${index}"
style="margin-left: 10px;">下载</span>
<span class="layui-table-link" id="snapshot_wkinfoMore_${index}">更多</span>
</h5>
<div id="snapshot_wkinfo_${index}"></div>
</div>
</div>
`
})
// console.log(domTableArr);
$('#table_arr_body').append(domTableArr)
// 渲染节点表格数据
tableArr.forEach((item,index)=>{
let cols = [];
let datas = [];
item.header.map((headerItem,headerIndex)=>{
cols.push({
field:headerItem.id,title:headerItem.name,sort:true,align:"center",
})
})
item.content.map((contItem,contIndex)=>{
let obj = {};
contItem.map((v,i)=>{
obj[v.kpiId] = v.kpiValue
})
datas.push(obj)
})
/*console.log('cols--------------',cols);
console.log('datas--------------',datas);*/
// 创建渲染实例
table.render({
elem: `#snapshot_wkinfo_${index}`
,page: false
,data: datas
,cols: [cols]
,done(response, curr, count){
console.log(response);
let params = {
kpiId:"",
resId:resId,
batchNo:batchNo
}
// 点击下载的方法
$(`#snapshot_wkinfoDownload_${index}`).unbind('click').on('click',()=>{
})
// 点击更多的方法
$(`#snapshot_wkinfoMore_${index}`).unbind('click').on('click',()=>{
view('commonViewModel').render("template/detail/snapshot_detail_more").then(function (res) {
layer.open({
title: ["更多", 'font-size:18px;'],
type: 1,
shadeClose: true,//开启遮罩层
area: ['90%', '690px'],
content: laytpl(res.body).render(JSON.stringify(params))
});
});
})
}
,error(){
}
})
})
}else {
layer.msg(res.msg, {
icon: 7, time: 2000
... ...
//更多列表
layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (exports) {
var $ = layui.$;
var admin = layui.admin;
var table = layui.table;
var common = layui.common;
var commonDetail = layui.commonDetail;
//对外暴露的接口
exports('snapshot_detail_more', function (data) {
console.log(data);
var commonDetail = layui.commonDetail;
var resId = data.resId;
var kpiId = data.kpiId;
var flag = data.flag;
var sortBy = data.sortBy;
var order = data.order;
var colWidth = data.colWidth;
var url = "/api-web/snapshot/info/page";
table.render({
elem: '#detail_more_snapshot'
, url : url
, id: 'detail_more_snapshot'
, cols: []
, even: true
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
, theme: '#1E9FFF'
}
, height: 'full-300'
, limit: common.limit
, limits: common.limits
, done(){
}
,error(){
}
})
})
});
\ No newline at end of file
... ...
... ... @@ -22,9 +22,13 @@
</ul>
</div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">性能信息</h5>
<ul class="info-table" id="hostminicomputerpartition_sysfile"></ul>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">性能信息</h5>
<div id="hostminicomputerpartition_sysfile"></div>
</div>
</div>
<div id="table_arr_body">
</div>
<div class="lay-row">
<div class="lay-row-item">
... ...
<title>快照更多展示</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="layui-card">
<div class="layui-card-body">
<table id="detail_more_snapshot" lay-filter="detail_more_snapshot"></table>
</div>
</div>
</div>
</div>
</article>
<script>
layui.use('snapshot_detail_more', function (fn) {
fn({{ d }});
});
</script>
\ No newline at end of file
... ...
... ... @@ -55,7 +55,7 @@
<template #tools="{scope}">
<div class="list-handle">
<span class="icon-bg">
<i @click="handleDetail(scope.row.resName,scope.row.resType)" class="el-icon-document" title="查看详情"></i>
<i @click="handleDetail(scope.row)" class="el-icon-document" title="查看详情"></i>
</span>
<span class="icon-bg">
<i @click="handleDelete(scope.row)" class="el-icon-delete" title="删除"></i>
... ...
... ... @@ -124,7 +124,7 @@ export default {
}
//快照详情
let handleDetail = (row)=>{
proxy.$global.openNewWin('template/detail/snapshot_detail', "快照详情", {resId:row.resId},false);
proxy.$global.openNewWin('template/detail/snapshot_detail', "快照详情", {resId:row.resId,'batchNo':row.batchNo},false);
}
//查看资源详情
... ...
... ... @@ -370,7 +370,8 @@ export default {
//快照详情
let handleDetail = (row)=>{
console.log(row);
// console.log(row);
// proxy.$global.openNewWin('template/detail/snapshot_detail_v1', "快照详情", {resId:row.resId,'batchNo':row.batchNo},false);
proxy.$global.openNewWin('template/detail/snapshot_detail', "快照详情", {resId:row.resId,'batchNo':row.batchNo},false);
}
... ...