diff --git a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
index 74c2322..9613d63 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
+++ b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
@@ -7855,6 +7855,10 @@ form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{
     display: flex;
     justify-content: flex-start;
 }
+#seachActiveWarning,#seachHistoryWarning{
+    margin-top:6px;
+    margin-right:6px;
+}
 #openStow,#openStowHis{
     color:#1E9FFF;
     cursor: pointer;
diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html b/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
index ed7dac0..2b2787f 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
@@ -90,15 +90,12 @@
                                             <button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
                                         </div>
                                     </div>-->
-                                    <!--lsq 活动告警增加搜索按钮 2022-06-21-->
-                                    <div class="layui-inline">
-                                        <div class="layui-input-inline layui-input-inline-sm">
-                                            <button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
-                                                搜索</button>
-                                        </div>
-                                    </div>
+
                                 </div>
                             </div>
+                            <!--lsq 活动告警增加搜索按钮 2022-06-21-->
+                            <button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
+                                        搜索</button>
                             <span id="openStow">展开</span>
                         </form>
                     </div>
diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html b/hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html
index 3baf5ea..b51d1ba 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html
@@ -80,15 +80,11 @@
                                         </select>
                                     </div>
                                 </div>
-                                <!--lsq 历史告警增加搜索按钮 2022-06-21-->
-                                <div class="layui-inline">
-                                    <div class="layui-input-inline layui-input-inline-sm">
-                                        <button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
-                                            搜索</button>
-                                    </div>
-                                </div>
                             </div>
                             </div>
+                            <!--lsq 历史告警增加搜索按钮 2022-06-21-->
+                            <button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
+                                搜索</button>
                             <span id="openStowHis">展开</span>
                         </form>
                     </div>
diff --git a/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js b/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
index e5a3efe..605eb13 100644
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
@@ -1277,10 +1277,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         }
         //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
         let formWidth=$('form[lay-filter="activewarning-form"] .layui-form-item').width();
-        let winWidth=$(window).width();
-        if(formWidth+300>winWidth){
+        let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
+        if(formWidth+100>winWidth){
+            $('#openStow').css('display','inline-block')
             $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
             $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
+        }else{
+            $('#openStow').css('display','none')
         }
         $("#openStow").unbind('click').on('click',function (){
             if($(this).text()=='展开'){
diff --git a/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js b/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
index 5398c53..cb67651 100644
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
@@ -790,10 +790,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
 
         //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
         let formWidth=$('form[lay-filter="historywarning-form"] .layui-form-item').width();
-        let winWidth=$(window).width();
-        if(formWidth+250>winWidth){
+        let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
+        if(formWidth+100>winWidth){
+            $('#openStowHis').css('display','inline-block')
+
             $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
             $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
+        }else{
+            $('#openStowHis').css('display','none')
         }
         $("#openStowHis").unbind('click').on('click',function (){
             if($(this).text()=='展开'){