Authored by 王涛

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

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

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

See merge request !1114
@@ -73,9 +73,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl', @@ -73,9 +73,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
73 $('#div-ip-card-body .ip-tab-content').empty(); 73 $('#div-ip-card-body .ip-tab-content').empty();
74 var domainList = response.data; 74 var domainList = response.data;
75 var liHtml = ''; 75 var liHtml = '';
76 - for (var i = 0; i < domainList.length; i++) {  
77 - liHtml += '<li>' + domainList[i].domainName + '</li>' 76 + //joke 屏蔽原来tab组装 20230419
  77 + // for (var i = 0; i < domainList.length; i++) {
  78 + // liHtml += '<li>' + domainList[i].domainName + '</li>'
  79 + // }
  80 + //joke modify 20230419 tab改为名称+数量,并带有提示
  81 + if (response.str && response.str.indexOf("&&")!=-1){
  82 + for (let i = 0; i < response.str.split("&&").length; i++) {
  83 + var v = response.str.split("&&")[i];
  84 + var name = v.split("_")[0];
  85 + var number = v.split("_")[1];
  86 + liHtml += '<li lay-tips="'+name+'C类地址段共'+number+'个">' + name + '('+ number +')</li>'
  87 + }
78 } 88 }
  89 +
79 $('#div-ip-card-body .layui-tab-title').html(liHtml); 90 $('#div-ip-card-body .layui-tab-title').html(liHtml);
80 $('#div-ip-card-body .ip-tab-content').html(laytpl($('#tpl-ip-segment-card').html()).render(response.data)); 91 $('#div-ip-card-body .ip-tab-content').html(laytpl($('#tpl-ip-segment-card').html()).render(response.data));
81 $('#div-ip-card-body .layui-tab-title li').eq(0).click(); 92 $('#div-ip-card-body .layui-tab-title li').eq(0).click();
@@ -89,7 +100,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl', @@ -89,7 +100,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
89 100
90 layer.open({ 101 layer.open({
91 title: '', 102 title: '',
92 - area: ['90%', '500px'], 103 + area: ['1582px', '440px'],
93 type: 1, 104 type: 1,
94 content: laytpl($('#tpl-ip-segment-big-content').html()).render(domainList[domainIndex].ipSegmentList[segmentIndex]), 105 content: laytpl($('#tpl-ip-segment-big-content').html()).render(domainList[domainIndex].ipSegmentList[segmentIndex]),
95 success: function () { 106 success: function () {
@@ -150,8 +161,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl', @@ -150,8 +161,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
150 if (str != "") { 161 if (str != "") {
151 str = str.substring(0, str.length - 1); 162 str = str.substring(0, str.length - 1);
152 } 163 }
153 - $('#ipTxtTips').html(str);  
154 - $('#ipTxtTips').removeClass('hide'); 164 + // $('#ipTxtTips').html(str);
  165 + // $('#ipTxtTips').removeClass('hide');
155 } 166 }
156 } else { 167 } else {
157 layer.msg('获取ip信息失败!', {icon: 0}); 168 layer.msg('获取ip信息失败!', {icon: 0});
@@ -6644,8 +6644,8 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6644,8 +6644,8 @@ form.form-edit .layui-form-item .layui-input-inline {
6644 } 6644 }
6645 6645
6646 .ip-segment-item-big { 6646 .ip-segment-item-big {
6647 - width: 1690px;  
6648 - height: 450px; 6647 + width: 1582px;
  6648 + height: 440px;
6649 background-color: #F2F2F2; 6649 background-color: #F2F2F2;
6650 cursor: default; 6650 cursor: default;
6651 } 6651 }
@@ -6680,7 +6680,7 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6680,7 +6680,7 @@ form.form-edit .layui-form-item .layui-input-inline {
6680 } 6680 }
6681 6681
6682 .ip-segment-item-big .ip-segment-content { 6682 .ip-segment-item-big .ip-segment-content {
6683 - width: 1680px; 6683 + width: 1582px;
6684 height: 400px; 6684 height: 400px;
6685 margin: 0 auto; 6685 margin: 0 auto;
6686 justify-content: space-between; 6686 justify-content: space-between;
@@ -6700,7 +6700,7 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6700,7 +6700,7 @@ form.form-edit .layui-form-item .layui-input-inline {
6700 } 6700 }
6701 6701
6702 .ip-segment-item-big .ip-segment-content .ip-info { 6702 .ip-segment-item-big .ip-segment-content .ip-info {
6703 - width: 43px; 6703 + width: 41px;
6704 height: 42px; 6704 height: 42px;
6705 margin: 3px; 6705 margin: 3px;
6706 text-align: center; 6706 text-align: center;
@@ -6878,7 +6878,7 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6878,7 +6878,7 @@ form.form-edit .layui-form-item .layui-input-inline {
6878 } 6878 }
6879 6879
6880 .ip-form-item .ip-form-inline .ip-form-num { 6880 .ip-form-item .ip-form-inline .ip-form-num {
6881 - width: 150px; 6881 + width: 130px;
6882 color: #999; 6882 color: #999;
6883 } 6883 }
6884 6884