monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit a0962e64e154198664a9ed29ab1373265f46cae6 1 parent fe16b823

【1390】【 告警中心】活动告警/历史告警，搜索按钮默认显示，其他搜索条件超出隐藏 #5

Inline Side-by-side
Showing 5 changed files with 22 additions and 18 deletions
@@ -7855,6 +7855,10 @@ form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{ @@ -7855,6 +7855,10 @@ form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{
7855 display: flex; 7855 display: flex;
7856 justify-content: flex-start; 7856 justify-content: flex-start;
7857 } 7857 }
  7858 +#seachActiveWarning,#seachHistoryWarning{
  7859 + margin-top:6px;
  7860 + margin-right:6px;
  7861 +}
7858 #openStow,#openStowHis{ 7862 #openStow,#openStowHis{
7859 color:#1E9FFF; 7863 color:#1E9FFF;
7860 cursor: pointer; 7864 cursor: pointer;
@@ -90,15 +90,12 @@ @@ -90,15 +90,12 @@
90 <button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button> 90 <button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
91 </div> 91 </div>
92 </div>--> 92 </div>-->
93 - <!--lsq 活动告警增加搜索按钮 2022-06-21-->  
94 - <div class="layui-inline">  
95 - <div class="layui-input-inline layui-input-inline-sm">  
96 - <button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >  
97 - 搜索</button>  
98 - </div>  
99 - </div> 93 +
100 </div> 94 </div>
101 </div> 95 </div>
  96 + <!--lsq 活动告警增加搜索按钮 2022-06-21-->
  97 + <button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
  98 + 搜索</button>
102 <span id="openStow">展开</span> 99 <span id="openStow">展开</span>
103 </form> 100 </form>
104 </div> 101 </div>
@@ -80,15 +80,11 @@ @@ -80,15 +80,11 @@
80 </select> 80 </select>
81 </div> 81 </div>
82 </div> 82 </div>
83 - <!--lsq 历史告警增加搜索按钮 2022-06-21-->  
84 - <div class="layui-inline">  
85 - <div class="layui-input-inline layui-input-inline-sm">  
86 - <button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >  
87 - 搜索</button>  
88 - </div>  
89 - </div>  
90 </div> 83 </div>
91 </div> 84 </div>
  85 + <!--lsq 历史告警增加搜索按钮 2022-06-21-->
  86 + <button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
  87 + 搜索</button>
92 <span id="openStowHis">展开</span> 88 <span id="openStowHis">展开</span>
93 </form> 89 </form>
94 </div> 90 </div>
@@ -1277,10 +1277,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -1277,10 +1277,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
1277 } 1277 }
1278 //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21 1278 //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
1279 let formWidth=$('form[lay-filter="activewarning-form"] .layui-form-item').width(); 1279 let formWidth=$('form[lay-filter="activewarning-form"] .layui-form-item').width();
1280 - let winWidth=$(window).width();  
1281 - if(formWidth+300>winWidth){ 1280 + let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
  1281 + if(formWidth+100>winWidth){
  1282 + $('#openStow').css('display','inline-block')
1282 $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px'); 1283 $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
1283 $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px'); 1284 $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
  1285 + }else{
  1286 + $('#openStow').css('display','none')
1284 } 1287 }
1285 $("#openStow").unbind('click').on('click',function (){ 1288 $("#openStow").unbind('click').on('click',function (){
1286 if($(this).text()=='展开'){ 1289 if($(this).text()=='展开'){
@@ -790,10 +790,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -790,10 +790,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
790 790
791 //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21 791 //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
792 let formWidth=$('form[lay-filter="historywarning-form"] .layui-form-item').width(); 792 let formWidth=$('form[lay-filter="historywarning-form"] .layui-form-item').width();
793 - let winWidth=$(window).width();  
794 - if(formWidth+250>winWidth){ 793 + let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
  794 + if(formWidth+100>winWidth){
  795 + $('#openStowHis').css('display','inline-block')
  796 +
795 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px'); 797 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
796 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px'); 798 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
  799 + }else{
  800 + $('#openStowHis').css('display','none')
797 } 801 }
798 $("#openStowHis").unbind('click').on('click',function (){ 802 $("#openStowHis").unbind('click').on('click',function (){
799 if($(this).text()=='展开'){ 803 if($(this).text()=='展开'){