Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

w告警中心的搜索条件过多时，展开和收起功能调整 #1



See merge request !692

@@ -3839,6 +3839,8 @@ grayColor {
     background-color: #f1f1f1;
     background-color: #f1f1f1;
     /*lsq 活动告警列表卡片样式调整 2022-06-21*/
     /*lsq 活动告警列表卡片样式调整 2022-06-21*/
     min-height: 74px;
     min-height: 74px;
+    z-index: 99;
+    position: relative;
 }
 }
 
 
 .warn-count-item {
 .warn-count-item {
@@ -8307,16 +8309,30 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] {
     margin-right: 6px;
     margin-right: 6px;
 }
 }
 
 
-#openStow, #openStowHis {
+.openStow {
     color: #1E9FFF;
     color: #1E9FFF;
     cursor: pointer;
     cursor: pointer;
     line-height: 50px;
     line-height: 50px;
+    width:45px;
+}
+.form-item-open-stow{
+    flex:1;
 }
 }
-
 #noticeSearchQueryBtn, #seachNoticemerge {
 #noticeSearchQueryBtn, #seachNoticemerge {
     margin-top: -3px;
     margin-top: -3px;
 }
 }
+.noticeCount-lay-row-title{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.noticeCount-lay-row-title .layui-btn-group{
+    margin-right: 0;
+}
 
 
+.layui-card .noticeCount-table .layui-table-view{
+    margin:0 3px;
+}
 #queryMore {
 #queryMore {
     cursor: pointer;
     cursor: pointer;
 }
 }

@@ -107,7 +107,7 @@
                                     type="button">
                                     type="button">
                                 查询
                                 查询
                             </button>
                             </button>
-                            <span id="openStow">展开</span>
+                            <span class="openStow">展开</span>
                         </form>
                         </form>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -99,7 +99,7 @@
                                     type="button">
                                     type="button">
                                 查询
                                 查询
                             </button>
                             </button>
-                            <span id="openStowHis">展开</span>
+                            <span class="openStow">展开</span>
                         </form>
                         </form>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -58,8 +58,8 @@
                                 </div>
                                 </div>
                                 <div class="layui-inline">
                                 <div class="layui-inline">
                                     <button class="layui-btn layui-btn-normal" id="noticeSearchQueryBtn" type="button">
                                     <button class="layui-btn layui-btn-normal" id="noticeSearchQueryBtn" type="button">
-                                        <i
-                                                class="layui-icon layui-icon-search"></i>查询
+                                    <!-- lsq 注释掉查询按钮的图标 2022-06-27 <i class="layui-icon layui-icon-search"></i>-->
+                                        查询
                                     </button>
                                     </button>
                                 </div>
                                 </div>
                             </div>
                             </div>

@@ -44,25 +44,28 @@
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>
-                    <div class="layui-card-body" style="margin-top: 5px;height: 40px">
-                        <div class="layui-btn-group time-group" id="noticeCount_time_table_id"
-                             style="float: right;margin-right: 20px;">
-                            <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastYear"
-                                    type="button">去年
-                            </button>
-                            <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="year"
-                                    type="button">今年
-                            </button>
-                            <div class="layui-btn layui-btn-primary layui-btn-sm" id="exportNoticeCountBtn"
-                                 lay-tips="导出"><i class="layui-icon">&#xe60a;</i>导出
+
+                    <div class="layui-card-body noticeCount-table" id="table_notice_send_year" style="margin-top: 5px;background: #fff;">
+                        <h5 class="lay-row-title noticeCount-lay-row-title">
+                            业务子系统年统计
+                            <!--lsq 调整样式 2022-06-27-->
+                            <div class="layui-card-body" style="margin-top: 5px;height: 40px">
+                                <div class="layui-btn-group time-group" id="noticeCount_time_table_id">
+                                    <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastYear"
+                                            type="button">去年
+                                    </button>
+                                    <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="year"
+                                            type="button">今年
+                                    </button>
+                                    <div class="layui-btn layui-btn-primary layui-btn-sm" id="exportNoticeCountBtn"
+                                         lay-tips="导出"><i class="layui-icon">&#xe60a;</i>导出
+                                    </div>
+                                </div>
                             </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="layui-card-body noticeCount-table" id="table_notice_send_year" style="margin-top: 5px">
-                        <h5 class="lay-row-title">业务子系统年统计</h5>
-                        <table id="table_notice_send_business" lay-filter="table_notice_send_business"></table>
+                        </h5>
+                        <table style="margin:0 3px;" id="table_notice_send_business" lay-filter="table_notice_send_business" ></table>
                         <h5 class="lay-row-title">人员年统计</h5>
                         <h5 class="lay-row-title">人员年统计</h5>
-                        <table id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
+                        <table style="margin:0 3px;"  id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
 
 
                     </div>
                     </div>
                 </div>
                 </div>

@@ -20,7 +20,8 @@
                                     <div class="layui-input-inline layui-input-inline-sm">
                                     <div class="layui-input-inline layui-input-inline-sm">
                                         <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachNoticemerge"
                                         <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachNoticemerge"
                                                 type="button">
                                                 type="button">
-                                            搜索
+                                           <!-- lsq 搜索更改为查询 2022-06-27-->
+                                            查询
                                         </button>
                                         </button>
                                     </div>
                                     </div>
                                 </div>
                                 </div>

@@ -24,7 +24,7 @@
                               v-else v-model="search.keyword"></el-input>
                               v-else v-model="search.keyword"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item>
                 <el-form-item>
-                    <el-button :size="$global.elementConfig.size.button" @click="getDataList(statusVal)">查询</el-button>
+                    <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList(statusVal)">查询</el-button>
                 </el-form-item>
                 </el-form-item>
             </div>
             </div>
         </div>
         </div>

@@ -6,7 +6,7 @@
                     <el-input :size="$global.elementConfig.size.input"  v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
                     <el-input :size="$global.elementConfig.size.input"  v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item >
                 <el-form-item >
-                    <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
+                    <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
                 </el-form-item>
                 </el-form-item>
             </div>
             </div>
         </div>
         </div>

@@ -1286,24 +1286,25 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         }
         }
 
 
         //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
         //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
-        let formWidth = $('form[lay-filter="activewarning-form"] .layui-form-item').width();
-        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');
+        let formWidth =sessionStorage.getItem('formWidth');
+        if(!formWidth){
+            formWidth= $('.form-item-open-stow').width();
+            sessionStorage.setItem('formWidth',formWidth)
+        }
+        let winWidth = $('.form-item-open-stow').parents('.layui-card-header').width();
+        if (formWidth + 120 > winWidth) {
+            $('.openStow').css('display', 'inline-block')
+            $('.form-item-open-stow').css('height', '50px');
         } else {
         } else {
-            $('#openStow').css('display', 'none')
+            $('.openStow').css('display', 'none')
         }
         }
-        $("#openStow").unbind('click').on('click', function () {
+        $(".openStow").unbind('click').on('click', function () {
             if ($(this).text() == '展开') {
             if ($(this).text() == '展开') {
                 $(this).text('收起')
                 $(this).text('收起')
-                $('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', 'auto');
+                $('.form-item-open-stow').css('height', 'auto');
             } else {
             } else {
                 $(this).text('展开')
                 $(this).text('展开')
-                $('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');
+                $('.form-item-open-stow').css('height', '50px');
             }
             }
         })
         })
         //end lsq 2022-06-21
         //end lsq 2022-06-21

@@ -792,7 +792,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         })();
         })();
 
 
         //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
         //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
-        let formWidth = $('form[lay-filter="historywarning-form"] .layui-form-item').width();
+        /*let formWidth = $('form[lay-filter="historywarning-form"] .layui-form-item').width();
         let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
         let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
         if (formWidth + 100 > winWidth) {
         if (formWidth + 100 > winWidth) {
             $('#openStowHis').css('display', 'inline-block')
             $('#openStowHis').css('display', 'inline-block')
@@ -812,6 +812,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width', (formWidth - 50) + 'px');
                 $('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');
                 $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height', '50px');
             }
             }
+        })*/
+        let formWidth =sessionStorage.getItem('formWidth');
+        if(!formWidth){
+            formWidth= $('.form-item-open-stow').width();
+            sessionStorage.setItem('formWidth',formWidth)
+        }
+        let winWidth = $('.form-item-open-stow').parents('.layui-card-header').width();
+        if (formWidth + 120 > 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-21
         //end lsq 2022-06-21
     });
     });