monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 3f71f914c36d22d7e69f6bd1630a3f99382f2c11 2 parents af6a3719 7038f9ff

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

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 9 changed files with 89 additions and 82 deletions
... ... @@ -231,46 +231,6 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
if ($.isFunction(fun)) {
fun.call(this, data, node.data, options);
}
//start lsq 域视图搜索条件太多，增加展开/收起的功能 2022-06-27
let formWidth =$('.form-item-open-stow').width();
let elem=$('.form-item-open-stow');
if(elem){
for(let i=0;i<elem.length;i++){
if($(elem[i]).width()){
formWidth=$(elem[i]).width();
}
}
}
if(!formWidth){
formWidth= sessionStorage.getItem('formWidth');
}else{
sessionStorage.setItem('formWidth',formWidth)
}
let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
let elemW=$('.form-item-open-stow').parents('.layui-status');
if(elemW){
for(let i=0;i<elemW.length;i++){
if($(elemW[i]).width()){
winWidth=$(elemW[i]).width();
}
}
}
if (formWidth + 130 > winWidth) {
$('.openStow').css('display', 'inline-block')
$('.form-item-open-stow').css('height', '50px');
} else {
$('.openStow').css('display', 'none')
}
$(".openStow").unbind('click').on('click', function () {
if ($(this).text() == '展开') {
$(this).text('收起')
$('.form-item-open-stow').css('height', 'auto');
} else {
$(this).text('展开')
$('.form-item-open-stow').css('height', '50px');
}
})
//end lsq 2022-06-27
}
});
loadParamSelect();
... ... @@ -302,6 +262,49 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
loadDomainTree($(this).val())
}
});
//lsq 设置展开/收起
function setOpenStow(){
//start lsq 域视图搜索条件太多，增加展开/收起的功能 2022-06-27
let formWidth =$('.form-item-open-stow').width();
let elem=$('.form-item-open-stow');
if(elem){
for(let i=0;i<elem.length;i++){
if($(elem[i]).width()){
formWidth=$(elem[i]).width();
}
}
}
if(!formWidth){
formWidth= sessionStorage.getItem('formWidth');
}else{
sessionStorage.setItem('formWidth',formWidth)
}
let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
let elemW=$('.form-item-open-stow').parents('.layui-status');
if(elemW){
for(let i=0;i<elemW.length;i++){
if($(elemW[i]).width()){
winWidth=$(elemW[i]).width();
}
}
}
if (winWidth>0 && formWidth + 130 > winWidth) {
$('.openStow').css('display', 'inline-block')
$('.form-item-open-stow').css('height', '50px');
} else {
$('.openStow').css('display', 'none')
}
$(".openStow").unbind('click').on('click', function () {
if ($(this).text() == '展开') {
$(this).text('收起')
$('.form-item-open-stow').css('height', 'auto');
} else {
$(this).text('展开')
$('.form-item-open-stow').css('height', '50px');
}
})
//end lsq 2022-06-27
}
//资源详细页面
function loadResDetailInfo(parentNode, data, node, options) {
... ... @@ -427,6 +430,8 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
renderDomainSerach(resType, domainId);
form.render(null, 'domain-list-form');
setOpenStow();
// var cols = [{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}
// , {
// field: 'resName', title: '资源名称', minWidth: 210, align: 'center', sort: true,
... ... @@ -697,6 +702,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
,
done: function (res) {
soulTable.render(this)
commonCols.colsClickEvent();
//调用收藏方法
resFavorites();
... ... @@ -788,6 +794,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
common.saveTableCols(params);
$(this).addClass("hide");
});
}
});
});
... ... @@ -801,6 +808,8 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
renderDomainSerach(resType, domainId, true);
form.render(null, 'domain-list-form');
setOpenStow();
// var cols = [{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}
// , {
// field: 'resName', title: '资源名称', minWidth: 210, align: 'center', sort: true,
... ... @@ -1057,6 +1066,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
, cols: [cols]
, done: function (res) {
soulTable.render(this)
commonCols.colsClickEvent();
//调用收藏方法
resFavorites();
... ... @@ -1255,6 +1265,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
, height: 'full-300',
done: function (res) {
soulTable.render(this);
commonCols.colsClickEvent();
//调用收藏方法
resFavorites();
... ...
... ... @@ -185,7 +185,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
admin.req({
url: domainName + '/api-web/notice/getNoticeBusTypes',
success: function (response) {
if (response && response.success) {
if (response && response.success && response.data.length > 0) {
var busTypeList = response.data;
// 影响业务下拉框
busIdSelect = xmSelect.render({
... ... @@ -228,7 +228,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
$('#notice_search_busId').find('.xm-body').eq(0).css("width", "230px");
}
} else {
layer.msg('获取业务失败', {icon: 2});
//lsq 无数据时隐藏下拉列表 2022-08-28
$("#notice_search_busId_div").hide();
// layer.msg('获取业务失败', {icon: 2});
}
},
error: function () {
... ... @@ -241,7 +243,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
method: 'GET',
success: function (res) {
// 资源类型下拉框
if (res && res.success) {
if (res && res.success && response.data.length > 0) {
var resTypeList = res.data;
resTypeSelect = xmSelect.render({
el: '#notice_search_resType',
... ... @@ -282,7 +284,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
$('#notice_search_resType').find('.xm-body').eq(0).css("width", "230px");
}
} else {
layer.msg('获取资源类型失败', {icon: 2});
//lsq 无数据时隐藏下拉列表 2022-08-28
$("#notice_search_resType_div").hide();
// layer.msg('获取资源类型失败', {icon: 2});
}
}
... ...
... ... @@ -3,7 +3,7 @@
* @author joke
* @date 2020/4/21 9:37
**/
layui.define(['commonDetail', 'common'], function (exports) {
layui.define(['commonDetail','common'], function (exports) {
var commonDetail = layui.commonDetail;
var common = layui.common;
//对外暴露的接口
... ... @@ -11,10 +11,10 @@ layui.define(['commonDetail', 'common'], function (exports) {
var resId = '';
var resType = '';
var showFlag = common.getUrlParam("show");
if (showFlag && showFlag == '0') {
if(showFlag && showFlag == '0'){
resId = common.getUrlParam("resId");
resType = common.getUrlParam("resType");
} else {
}else{
resId = data.resId;
resType = data.resType;
}
... ... @@ -37,7 +37,7 @@ layui.define(['commonDetail', 'common'], function (exports) {
//渲染页面
function reload() {
//基本信息
commonDetail.renderText("storage_share_hs_baseinfo", resId, jbxxKpi);
commonDetail.renderText("storage_share_hs_baseinfo",resId,jbxxKpi);
//性能信息
// commonDetail.renderText("storage_share_hs_xnxxinfo",resId,xnxxKpi);
// commonDetail.renderCircular('storage_share_hs_xnxxinfo_chart',resId,'KPI5E148DBE',"存储空间使用率","%")
... ... @@ -55,20 +55,20 @@ layui.define(['commonDetail', 'common'], function (exports) {
// commonDetail.renderGauge("storage_share_hs_memeryrate",resId,"KPI31CB8D97",false);
//CPU使用率走势(12小时)
commonDetail.renderLineCharat("storage_share_hs_cpu_linechart", resId, "KPI7054BC34", "CPU使用率走势", "cpu");
commonDetail.renderLineCharat("storage_share_hs_cpu_linechart",resId,"KPI7054BC34","CPU使用率走势","cpu");
//内存使用率走势(12小时)
commonDetail.renderLineCharat("storage_share_hs_memery_linechart", resId, "KPI31CB8D97", "内存使用率走势", "mem")
commonDetail.renderLineCharat("storage_share_hs_memery_linechart",resId,"KPI31CB8D97","内存使用率走势","mem")
//存储池信息
commonDetail.renderTable("storage_share_hs_storagepool", false, resId, storagepoolkpi, '存储池信息', 'storage');
commonDetail.renderTable("storage_share_hs_storagepool",false,resId,storagepoolkpi,'存储池信息','storage');
//存储网卡信息
commonDetail.renderTable("storage_share_hs_network", false, resId, storagemachinekpi, '存储网卡信息', 'port-');
commonDetail.renderTable("storage_share_hs_network",false,resId,storagemachinekpi,'存储网卡信息','port-');
//存储磁盘信息
commonDetail.renderTable("storage_share_hs_disk", false, resId, diskkpi, '存储磁盘信息', 'disk-');
commonDetail.renderTable("storage_share_hs_disk",false,resId,diskkpi,'存储磁盘信息','disk-');
//存储LUN信息
commonDetail.renderTable("storage_share_hs_lun", false, resId, lunkpi, '存储LUN信息', 'lun-');
commonDetail.renderTable("storage_share_hs_lun",false,resId,lunkpi,'存储LUN信息','lun-');
//活动告警
commonDetail.renderActiveAlarms("storage_share_hs_alarms", resId);
commonDetail.renderActiveAlarms("storage_share_hs_alarms",resId);
}
//定时任务
... ... @@ -77,4 +77,4 @@ layui.define(['commonDetail', 'common'], function (exports) {
// },commonDetail.timerTime);
// commonDetail.detailTimer.push(timer);
});
});
});
\ No newline at end of file
... ...
... ... @@ -868,14 +868,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//重置密码
function resetPassword(id, username) {
//根据王凤要求，调整重置密码，不弹窗，直接后台设置为123456
//lsq 弹框高度调小，文本框垂直居中 2022-08-27
layer.open({
title: "重置密码",
content: '<div>' +
content: '<div style="height:100%;display: flex;align-items: center;justify-content: space-between;">' +
'<input id="userReSetPwd" style="float：left;width:80%;line-height:38px" type="password" placeholder="' + patternTips.replace('密码格式为：', '') + '">' +
'<button style="float:right;height:40px;width: 15%;line-height:40px;background-color: #1e9fff;" class="layui-btn layui-btn-sm layui-btn-normal showPwd" >显示密码</button>' +
'</div>' +
'<span class="deptTips" style="color: red"></span>',
area: ['30%', '350px'],
area: ['30%', '220px'],
btns: ['确认', '取消'],
success: function (index) {
$('.showPwd').unbind().on('click', function () {
... ...
... ... @@ -8334,6 +8334,7 @@ form.layui-card-header.layuiadmin-card-header-auto {
cursor: pointer;
line-height: 50px;
width:45px;
display:none;
}
.form-item-open-stow{
flex:1;
... ...
... ... @@ -30,7 +30,7 @@
</div>
</div>
<!--资源类型-->
<div class="layui-inline">
<div class="layui-inline" id="notice_search_resType_div">
<div class="layui-input-inline layui-input-inline--long">
<div class="xm-select-demo" id="notice_search_resType"></div>
</div>
... ... @@ -42,7 +42,7 @@
</div>
</div>
<!--业务类型-->
<div class="layui-inline">
<div class="layui-inline" id="notice_search_busId_div">
<div class="layui-input-inline layui-input-inline--long">
<div class="xm-select-demo" id="notice_search_busId"></div>
</div>
... ...
... ... @@ -6,8 +6,7 @@
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item lay-row-item--auto-width">
<h5 class="lay-row-title">基本信息<i class="iconfont detail_base_info"
data-id="storage_share_hs_baseinfo">&#xe61e;</i></h5>
<h5 class="lay-row-title">基本信息<i data-id="storage_share_hs_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="storage_share_hs_baseinfo"></ul>
</div>
<!-- <div class="lay-row-item lay-row-item&#45;&#45;auto-width">-->
... ... @@ -42,11 +41,11 @@
<!-- </div>-->
<div class="lay-row-item">
<h5 class="lay-row-title">CPU使用率走势</h5>
<div class="detail_line_chart" id="storage_share_hs_cpu_linechart"></div>
<div id="storage_share_hs_cpu_linechart" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">内存使用率走势</h5>
<div class="detail_line_chart" id="storage_share_hs_memery_linechart"></div>
<div id="storage_share_hs_memery_linechart" class="detail_line_chart"></div>
</div>
</div>
<!-- <div class="lay-row">-->
... ... @@ -65,36 +64,25 @@
<!-- </div>-->
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">存储池信息<span class="layui-table-link"
id="storage_share_hs_storagepoolDownload"
style="margin-left: 10px;">下载</span><span
class="layui-table-link" id="storage_share_hs_storagepoolMore">更多</span></h5>
<h5 class="lay-row-title">存储池信息<span id="storage_share_hs_storagepoolMore" class="layui-table-link">更多</span></h5>
<div id="storage_share_hs_storagepool"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">存储网卡信息<span class="layui-table-link"
id="storage_share_hs_networkDownload"
style="margin-left: 10px;">下载</span><span
class="layui-table-link" id="storage_share_hs_networkMore">更多</span></h5>
<h5 class="lay-row-title">存储网卡信息<span id="storage_share_hs_networkMore" class="layui-table-link">更多</span></h5>
<div id="storage_share_hs_network"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">存储磁盘信息<span class="layui-table-link"
id="storage_share_hs_diskDownload"
style="margin-left: 10px;">下载</span><span
class="layui-table-link" id="storage_share_hs_diskMore">更多</span></h5>
<h5 class="lay-row-title">存储磁盘信息<span id="storage_share_hs_diskMore" class="layui-table-link">更多</span></h5>
<div id="storage_share_hs_disk"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">存储LUN信息<span class="layui-table-link"
id="storage_share_hs_lunDownload" style="margin-left: 10px;">下载</span><span
class="layui-table-link" id="storage_share_hs_lunMore">更多</span></h5>
<h5 class="lay-row-title">存储LUN信息<span id="storage_share_hs_lunMore" class="layui-table-link">更多</span></h5>
<div id="storage_share_hs_lun"></div>
</div>
</div>
... ... @@ -114,10 +102,10 @@
layui.use('storage_share_hs', function (fn) {
var $ = layui.$;
var parm = $("#storage_share_hs_param_id").val();
if (parm.indexOf('{{d') != -1) {
if(parm.indexOf('{{d') != -1){
fn();
} else {
}else{
fn(JSON.parse(parm));
}
});
</script>
</script>
\ No newline at end of file
... ...
... ... @@ -877,6 +877,8 @@ layui.define(['xmSelect', 'md5'], function (exports) {
var shareMap = new Map();
shareMap.set('HUAWEI', 'STORAGE_SHARE');
shareMap.set('Inspur', 'STORAGE_SHARE_INSPUR');
//lsq 增加hongshan厂商对应详情页关系 2022-08-28
shareMap.set('hongshan', 'STORAGE_SHARE_HS');
if (resType.indexOf('HOST_X86SERVER') != -1) {
if (bean.provider == 'HP' && bean.model.split('-')[0] == 'C7000') {
... ...