monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ef8d8ebcad2a380d77057124db1b5636759d1c03 2 parents 9fa10b51 10bd61d3

Merge branch 'master-mj-joke' into 'master-mj' 

fix:ip视图弹出框展示有滚动条，禅道bug#2336

fix:ip视图弹出框展示有滚动条，禅道bug#2336

See merge request !1114
Inline Side-by-side
Showing 2 changed files with 21 additions and 10 deletions
... ... @@ -73,9 +73,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
$('#div-ip-card-body .ip-tab-content').empty();
var domainList = response.data;
var liHtml = '';
for (var i = 0; i < domainList.length; i++) {
liHtml += '<li>' + domainList[i].domainName + '</li>'
//joke 屏蔽原来tab组装 20230419
// for (var i = 0; i < domainList.length; i++) {
// liHtml += '<li>' + domainList[i].domainName + '</li>'
// }
//joke modify 20230419 tab改为名称+数量，并带有提示
if (response.str && response.str.indexOf("&&")!=-1){
for (let i = 0; i < response.str.split("&&").length; i++) {
var v = response.str.split("&&")[i];
var name = v.split("_")[0];
var number = v.split("_")[1];
liHtml += '<li lay-tips="'+name+'C类地址段共'+number+'个">' + name + '('+ number +')</li>'
}
}
$('#div-ip-card-body .layui-tab-title').html(liHtml);
$('#div-ip-card-body .ip-tab-content').html(laytpl($('#tpl-ip-segment-card').html()).render(response.data));
$('#div-ip-card-body .layui-tab-title li').eq(0).click();
... ... @@ -89,7 +100,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
layer.open({
title: '',
area: ['90%', '500px'],
area: ['1582px', '440px'],
type: 1,
content: laytpl($('#tpl-ip-segment-big-content').html()).render(domainList[domainIndex].ipSegmentList[segmentIndex]),
success: function () {
... ... @@ -150,8 +161,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
if (str != "") {
str = str.substring(0, str.length - 1);
}
$('#ipTxtTips').html(str);
$('#ipTxtTips').removeClass('hide');
// $('#ipTxtTips').html(str);
// $('#ipTxtTips').removeClass('hide');
}
} else {
layer.msg('获取ip信息失败!', {icon: 0});
... ...
... ... @@ -6644,8 +6644,8 @@ form.form-edit .layui-form-item .layui-input-inline {
}
.ip-segment-item-big {
width: 1690px;
height: 450px;
width: 1582px;
height: 440px;
background-color: #F2F2F2;
cursor: default;
}
... ... @@ -6680,7 +6680,7 @@ form.form-edit .layui-form-item .layui-input-inline {
}
.ip-segment-item-big .ip-segment-content {
width: 1680px;
width: 1582px;
height: 400px;
margin: 0 auto;
justify-content: space-between;
... ... @@ -6700,7 +6700,7 @@ form.form-edit .layui-form-item .layui-input-inline {
}
.ip-segment-item-big .ip-segment-content .ip-info {
width: 43px;
width: 41px;
height: 42px;
margin: 3px;
text-align: center;
... ... @@ -6878,7 +6878,7 @@ form.form-edit .layui-form-item .layui-input-inline {
}
.ip-form-item .ip-form-inline .ip-form-num {
width: 150px;
width: 130px;
color: #999;
}
... ...