Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-xwx

@@ -1729,7 +1729,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                                 templet: '#powerStateTpl',
                                 sort: true
                             },
-                            {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true},
+                            {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
+                               // lsq 运行状态显示为中文 2022-06-28
+                                templet: function (d) {
+                                    switch (d.runState) {
+                                        case 'notRunning':
+                                            return '未运行';
+                                        case 'running':
+                                            return '运行';
+                                        default:
+                                            return '';
+                                    }
+                                }},
                             {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
                             {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
                             {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -1863,7 +1874,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#powerStateTpl',
                     sort: true
                 },
-                {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_110, align: 'center', sort: true,
+                    // lsq 运行状态显示为中文 2022-06-28
+                    templet: function (d) {
+                        switch (d.runState) {
+                            case 'notRunning':
+                                return '未运行';
+                            case 'running':
+                                return '运行';
+                            default:
+                                return '';
+                        }
+                    }},
                 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
                 {field: 'resourcePool', title: '所属资源池', minWidth: x_140, align: 'center', sort: true},
                 {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
@@ -4091,7 +4113,18 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#powerStateTpl',
                     sort: true
                 },
-                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,
+                    // lsq 运行状态显示为中文 2022-06-28
+                    templet: function (d) {
+                        switch (d.runState) {
+                            case 'notRunning':
+                                return '未运行';
+                            case 'running':
+                                return '运行';
+                            default:
+                                return '';
+                        }
+                    }},
                 {field: 'ptName', title: '所属平台', minWidth: x_120, align: 'center', sort: true},
                 {field: 'resourcePool', title: '所属资源池', minWidth: x_150, align: 'center', sort: true},
                 {field: 'resRemark', title: '备注', minWidth: x_200, align: 'center'}

@@ -59,7 +59,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
                 reloadTable();
             }
         });
-
+        //lsq 域视图页增加搜索按钮 2022-06-27
+        $('#searchDomainIndex').unbind('click').on('click', function () {
+            reloadTable();
+        })
         var loading = layer.load(2);
 
         //this
@@ -228,6 +231,46 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
                                 if ($.isFunction(fun)) {
                                     fun.call(this, data, node.data, options);
                                 }
+                                //start lsq 域视图搜索条件太多，增加展开/收起的功能 2022-06-27
+                                let formWidth =$('.form-item-open-stow').width();
+                                let elem=$('.form-item-open-stow');
+                                if(elem){
+                                    for(let i=0;i<elem.length;i++){
+                                        if($(elem[i]).width()){
+                                            formWidth=$(elem[i]).width();
+                                        }
+                                    }
+                                }
+                                if(!formWidth){
+                                    formWidth= sessionStorage.getItem('formWidth');
+                                }else{
+                                    sessionStorage.setItem('formWidth',formWidth)
+                                }
+                                let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+                                let elemW=$('.form-item-open-stow').parents('.layui-status');
+                                if(elemW){
+                                    for(let i=0;i<elemW.length;i++){
+                                        if($(elemW[i]).width()){
+                                            winWidth=$(elemW[i]).width();
+                                        }
+                                    }
+                                }
+                                if (formWidth + 130 > 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-27
                             }
                         });
                         loadParamSelect();
@@ -1320,6 +1363,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
                             renderTreeTable(domainId, curTreeNode.data.id)
                         }
                     });
+                    //lsq 域视图页增加搜索按钮 2022-06-27
+                    $('#searchDomainTreeTable').unbind('click').on('click', function () {
+                        renderTreeTable(domainId, curTreeNode.data.id);
+                    })
                     //选择资源状态
                     form.on('select(domain_treetable_resStatus)', function (data) {
                         renderTreeTable(domainId, curTreeNode.data.id);

@@ -19,7 +19,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                 return false;
             }
         });
-
+        //lsq 关系视图页增加搜索按钮 2022-06-27
+        $('#searchRelationIndex').unbind('click').on('click', function () {
+            reloadTable();
+            return false;
+        })
         // 资源类型下拉框
         common.resTypeXmSelect({
             el: '#slt-relation-resType',
@@ -241,5 +245,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
             window.open(common.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + accessToken + '&id=' + jtopoId + "&layout=organic");
         }
 
+        //start lsq 关系视图搜索条件太多，增加展开/收起的功能 2022-06-27
+        let formWidth =$('.form-item-open-stow').width();
+        let elem=$('.form-item-open-stow');
+        if(elem){
+            for(let i=0;i<elem.length;i++){
+                if($(elem[i]).width()){
+                    formWidth=$(elem[i]).width();
+                }
+            }
+        }
+        if(!formWidth){
+            formWidth= sessionStorage.getItem('formWidth');
+        }else{
+            sessionStorage.setItem('formWidth',formWidth)
+        }
+        let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+        let elemW=$('.form-item-open-stow').parents('.layui-status');
+        if(elemW){
+            for(let i=0;i<elemW.length;i++){
+                if($(elemW[i]).width()){
+                    winWidth=$(elemW[i]).width();
+                }
+            }
+        }
+        if (formWidth + 130 > 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-27
+
     });
 });

@@ -137,8 +137,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                 }
             });
         }
-
-
         //回选树节点
         function selectedTreeNode(target) {
             var el = $(target).find('.layui-tree-txt');
@@ -173,7 +171,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                 reloadTable();
             }
         });
-
+        //lsq 资源管理页增加搜索按钮 2022-06-27
+        $('#searchResmanageIndex').unbind('click').on('click', function () {
+            reloadTable();
+        })
         //按钮搜索
         $('#resmanageQueryBtn').unbind().on('click', function (e) {
             reloadTable();
@@ -2037,6 +2038,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                 common.openWin(url, name, params, null, null, null, ['80%', '80%']);
             });
         }
-
+        //lsq 展开/收起功能
+        function openStow(){
+            //start lsq 资源管理搜索条件太多，增加展开/收起的功能 2022-06-27
+            let formWidth =$('.form-item-open-stow').width();
+            let elem=$('.form-item-open-stow');
+            if(elem){
+                for(let i=0;i<elem.length;i++){
+                    if($(elem[i]).width()){
+                        formWidth=$(elem[i]).width();
+                    }
+                }
+            }
+            if(!formWidth){
+                formWidth= sessionStorage.getItem('formWidth');
+            }else{
+                sessionStorage.setItem('formWidth',formWidth)
+            }
+            let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+            let elemW=$('.form-item-open-stow').parents('.layui-status');
+            if(elemW){
+                for(let i=0;i<elemW.length;i++){
+                    if($(elemW[i]).width()){
+                        winWidth=$(elemW[i]).width();
+                    }
+                }
+            }
+            if (formWidth + 130 > 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-27
+        }
+        openStow();
     });
 });

@@ -3839,6 +3839,8 @@ grayColor {
     background-color: #f1f1f1;
     /*lsq 活动告警列表卡片样式调整 2022-06-21*/
     min-height: 74px;
+    z-index: 99;
+    position: relative;
 }
 
 .warn-count-item {
@@ -5486,6 +5488,13 @@ grayColor {
 .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active {
     color: #09ABEA !important;
 }
+.favorites-container .layui-card-header .layui-status .layui-form-item{
+    display:flex!important;
+    align-items: center;
+}
+.favorites-container .layui-form-item .layui-inline{
+    margin-bottom: 0;
+}
 
 .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs {
     display: none;
@@ -6046,7 +6055,10 @@ form.form-edit .layui-form-item .layui-input-inline {
     width: 18%;
     display: inline-block;
 }
-
+/*lsq 健康状态样式 2022-06-27*/
+.info-box-count-res{
+    width:260px;
+}
 .info-box-count > label {
     color: #999;
     font-size: 14px;
@@ -8297,26 +8309,40 @@ form[lay-filter="notice_search_form"] .layui-inline, form[lay-filter="noticemerg
     margin-top: 5px;
 }
 
-form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] {
+form.layui-card-header.layuiadmin-card-header-auto {
     display: flex;
     justify-content: flex-start;
 }
 
-#seachActiveWarning, #seachHistoryWarning {
+.searchButton {
     margin-top: 6px;
     margin-right: 6px;
 }
 
-#openStow, #openStowHis {
+.openStow {
     color: #1E9FFF;
     cursor: pointer;
     line-height: 50px;
+    width:45px;
+}
+.form-item-open-stow{
+    flex:1;
 }
-
 #noticeSearchQueryBtn, #seachNoticemerge {
     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 {
     cursor: pointer;
 }
@@ -8506,3 +8532,20 @@ form[lay-filter="activewarning-form"], form[lay-filter="historywarning-form"] {
 }
 
 /* //End XuHaoJie 2022/2/17 9:51 TODO  即时消息结束*/
+/*lsq 资源视图页面搜索栏样式调整 2022-06-27*/
+.resIndexMain .layui-form-item .layui-inline,
+.bizIndexMain .layui-form-item .layui-inline,
+.relation .layui-form-item .layui-inline,
+.res .layui-form-item .layui-inline{
+    margin-top:6px;
+}
+/*lsq 关系视图搜索栏样式调整 2022-06-27*/
+.relation .layui-form-item .layui-inline{
+    margin-bottom: 6px;
+}
+.layui-status .resIndex-input{
+    width: auto;
+}
+.res .layui-card-body{
+    background: #ffffff;
+}
\ No newline at end of file

@@ -103,11 +103,11 @@
                                 </div>
                             </div>
                             <!--lsq 活动告警增加搜索按钮 2022-06-21-->
-                            <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachActiveWarning"
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachActiveWarning"
                                     type="button">
                                 查询
                             </button>
-                            <span id="openStow">展开</span>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>

@@ -95,11 +95,11 @@
                                 </div>
                             </div>
                             <!--lsq 历史告警增加搜索按钮 2022-06-21-->
-                            <button class="layui-btn layui-btn-normal layui-btn-normal" id="seachHistoryWarning"
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachHistoryWarning"
                                     type="button">
                                 查询
                             </button>
-                            <span id="openStowHis">展开</span>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>

@@ -58,8 +58,8 @@
                                 </div>
                                 <div class="layui-inline">
                                     <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>
                                 </div>
                             </div>

@@ -17,7 +17,8 @@
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               id="resManageIndexForm">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含 </br>资源名称</br>ip地址</br>管理ip地址</br>备注"
@@ -77,12 +78,20 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <button class="layui-btn layui-btn-normal" id="resmanageQueryBtn" type="button"><i
-                                            class="layui-icon layui-icon-search"></i>查询
+                                <!--<div class="layui-inline">
+                                    <button class="layui-btn layui-btn-normal" id="resmanageQueryBtn" type="button">
+                                        &lt;!&ndash;lsq 取消掉查询按钮的图标 2022-06-27&ndash;&gt;
+                                        查询
                                     </button>
-                                </div>
+                                </div>-->
                             </div>
+                            </div>
+                            <!--lsq 资源管理增加展开/收起按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResmanageIndex"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>

@@ -20,7 +20,8 @@
                         <!--</div>-->
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="biz-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="bizindex_keyword"
@@ -90,6 +91,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 业务列表增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchBizIndex"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>
@@ -105,7 +113,8 @@
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="res-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="biz_treetable_keyword"
@@ -155,6 +164,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 业务列表增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchBizTreeTable"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>

@@ -38,7 +38,8 @@
                         <!--</div>-->
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="domain-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="domainindex_keyword"
@@ -108,6 +109,13 @@
                                 <!--                                    </div>-->
                                 <!--                                </div>-->
                             </div>
+                            </div>
+                            <!--lsq 域视图增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchDomainIndex"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>
@@ -123,7 +131,8 @@
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="res-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="domain_treetable_keyword"
@@ -161,6 +170,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 域视图增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchDomainTreeTable"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>
@@ -469,14 +485,14 @@
 </script>
 <script id="domainList-top-head-info-tpl" type="text/html">
     <div class="layui-card-header top-head-info">
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源总量</label>
             <div class="num">
                 <span lay-tips="资源总量" id="total_domain"></span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>健康状态</label>
             <div class="num">
@@ -490,7 +506,7 @@
                       id="healthNone_domain">0</span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源状态</label>
             <div class="num">
@@ -503,7 +519,7 @@
 
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>连接状态</label>
             <div class="num">

@@ -21,10 +21,10 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline favorite-cards">
-                                    <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
+                                    <div class="layui-input-inline layui-input-inline--long" >
                                         <button type="button" id="fav_keyword"
                                                 class="layui-btn layui-btn-normal layui-btn-normal">
-                                            搜索
+                                            查询
                                         </button>
                                     </div>
                                 </div>

@@ -44,25 +44,28 @@
                             </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 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 class="lay-row-title">人员年统计</h5>
-                        <table id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
+                        </h5>
+                        <table style="margin:0 3px;" id="table_notice_send_business" lay-filter="table_notice_send_business" ></table>
+                        <h5 class="lay-row-title" style="margin-top:6px;">人员年统计</h5>
+                        <table style="margin:0 3px;"  id="table_notice_send_user" lay-filter="table_notice_send_user"></table>
 
                     </div>
                 </div>

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

@@ -71,7 +71,8 @@
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="res-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="resindex_keyword"
@@ -133,13 +134,13 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline layui-input-inline--long">
+                                <div class="layui-inline layui-input-inline--long resIndex-input">
                                     <!--                                    <div class="layui-input-inline">-->
                                     <!--                                        <select name="label" id="resListBizTypes" lay-filter="resListBizTypes">-->
                                     <!--                                            <option value="">=所属业务=</option>-->
                                     <!--                                        </select>-->
                                     <!--                                    </div>-->
-                                    <div class="layui-input-inline layui-input-inline--long">
+                                    <div class="layui-input-inline layui-input-inline--long resIndex-input">
                                         <div class="xm-select-demo" id="resListBizTypes"></div>
                                     </div>
                                 </div>
@@ -201,6 +202,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 资源列表增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResIndex"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>
@@ -216,7 +224,8 @@
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="res-list-form">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" id="treetable_keyword" name="title"
@@ -269,6 +278,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 资源列表增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchResTreeTable"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>
@@ -380,14 +396,14 @@
 </script>
 <script id="resList-top-head-info-tpl" type="text/html">
     <div class="layui-card-header top-head-info">
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源总量</label>
             <div class="num">
                 <span lay-tips="资源总量" id="total_res">0</span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>健康状态</label>
             <div class="num">
@@ -398,7 +414,7 @@
                       id="healthNone_res">0</span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源状态</label>
             <div class="num">
@@ -436,14 +452,14 @@
 </script>
 <script id="resTreeList-top-head-info-tpl" type="text/html">
     <div class="layui-card-header top-head-info">
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源总量</label>
             <div class="num">
                 <span lay-tips="资源总量" id="tree_total_res">0</span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>健康状态</label>
             <div class="num">
@@ -457,7 +473,7 @@
                       id="tree_healthNone_res">0</span>
             </div>
         </div>
-        <div class="info-box-count">
+        <div class="info-box-count info-box-count-res">
             <i></i>
             <label>资源状态</label>
             <div class="num">

 <title>关系视图</title>
 <article class="page-container">
     <div class="page-panel">
-        <div class="main">
+        <div class="main relation">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <div class="layui-status">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto"
                               lay-filter="form-relation-condition">
-                            <div class="layui-form-item">
+                            <div class="form-item-open-stow">
+                                <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                         <input autocomplete="off" class="layui-input" lay-tips="关键字检索包含： </br>资源名称"
@@ -25,6 +26,13 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
+                            <!--lsq 域视图增加搜索按钮 2022-06-27-->
+                            <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="searchRelationIndex"
+                                    type="button">
+                                查询
+                            </button>
+                            <span class="openStow">展开</span>
                         </form>
                     </div>
                 </div>

@@ -61,7 +61,13 @@
     margin-bottom: 3px !important;
     /*width: 250px !important;*/
 }
-
+/*lsq esData下的搜索条件栏样式调整 2022-06-27*/
+.container .cm-card .search .condition.esData-conditon div {
+    margin-bottom: 0px !important;
+}
+.container .cm-card .search .condition.esData-conditon{
+    margin-bottom: 3px;
+}
 .container .cm-card .search .btns {
     width: 200px;
     display: flex;
@@ -153,3 +159,8 @@ custom-class="config-dialog"
 .tree-table .el-table .el-table__cell.is-center div {
     justify-content: center;
 }
+/*lsq 资产视图下搜索栏样式调整 2022-06-27*/
+.resList-form.el-form--inline .el-form-item{
+    align-items: center;
+    margin-right:6px;
+}
\ No newline at end of file

 <div>
-    <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
+    <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
                :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统"
                style="min-width: 120px;" v-model="modelValueLabel">
         <el-option :value="modelValue" style="height: auto;padding: 0;">

 <div>
-    <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
+    <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
                :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型"
                style="min-width: 120px;" v-model="modelValueLabel">
         <el-option :value="modelValue" style="height: auto;padding: 0;">

@@ -24,7 +24,7 @@
                               v-else v-model="search.keyword"></el-input>
                 </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>
             </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-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>
             </div>
         </div>

@@ -2,7 +2,7 @@
     <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}"
          class="cm-card">
         <div class="search">
-            <div class="condition">
+            <div class="condition esData-conditon">
                 <el-form-item>
                     <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容="
                               v-model="search.keyword"></el-input>
@@ -26,6 +26,7 @@
 
                 <el-form-item>
                     <el-date-picker
+                            :size="$global.elementConfig.size.input"
                             end-placeholder="结束时间"
                             format="YYYY-MM-DD HH:mm:ss"
                             range-separator="-"
@@ -36,7 +37,7 @@
                     />
                 </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>
             </div>
         </div>

@@ -12,10 +12,10 @@
             <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card">
                 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex">
                     <div style="width: calc(100% - 100px)">
-                        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
+                        <el-form :inline="true" :model="searchForm" class="demo-form-inline resList-form">
                             <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList">
 
-                                <el-select :placeholder="'请选择' + searchInfo.name" clearable
+                                <el-select :size="$global.elementConfig.size.input" :placeholder="'请选择' + searchInfo.name" clearable
                                            filterable
                                            v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]">
                                     <el-option
@@ -26,18 +26,18 @@
                                     </el-option>
                                 </el-select>
 
-                                <el-input :placeholder="'请输入' + searchInfo.name" v-else
+                                <el-input :size="$global.elementConfig.size.input" :placeholder="'请输入' + searchInfo.name" v-else
                                           v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input>
 
                             </el-form-item>
 
                             <el-form-item>
-                                <el-button @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
+                                <el-button :size="$global.elementConfig.size.button" type="primary" @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
                             </el-form-item>
                         </el-form>
                     </div>
                     <div style="width: 100px" v-if="$global.common.isAdminManager()">
-                        <el-button @click="showConfigDialog(true)" type="primary">配置</el-button>
+                        <el-button :size="$global.elementConfig.size.button" @click="showConfigDialog(true)" type="primary">配置</el-button>
                     </div>
                 </div>
 

@@ -1286,24 +1286,42 @@ 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 = $('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 =$('.form-item-open-stow').width();
+        let elem=$('.form-item-open-stow');
+        if(elem){
+            for(let i=0;i<elem.length;i++){
+                if($(elem[i]).width()){
+                    formWidth=$(elem[i]).width();
+                }
+            }
+        }
+        if(!formWidth){
+            formWidth= sessionStorage.getItem('formWidth');
+        }else{
+            sessionStorage.setItem('formWidth',formWidth)
+        }
+        let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+        let elemW=$('.form-item-open-stow').parents('.layui-status');
+        if(elemW){
+            for(let i=0;i<elemW.length;i++){
+                if($(elemW[i]).width()){
+                    winWidth=$(elemW[i]).width();
+                }
+            }
+        }
+        if (formWidth + 130 > winWidth) {
+            $('.openStow').css('display', 'inline-block')
+            $('.form-item-open-stow').css('height', '50px');
         } else {
-            $('#openStow').css('display', 'none')
+            $('.openStow').css('display', 'none')
         }
-        $("#openStow").unbind('click').on('click', function () {
+        $(".openStow").unbind('click').on('click', function () {
             if ($(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 {
                 $(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

@@ -67,7 +67,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                 return false;
             }
         });
-
+        //lsq 资源视图页增加搜索按钮 2022-06-27
+        $('#searchBizIndex').unbind('click').on('click', function () {
+            reloadTable();
+            return false;
+        })
         var loading = layer.load(2);
 
         // 树收缩事件
@@ -237,6 +241,47 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                                     }
 
                                 }
+
+                                //start lsq 业务视图搜索条件太多，增加展开/收起的功能 2022-06-27
+                                let formWidth =$('.form-item-open-stow').width();
+                                let elem=$('.form-item-open-stow');
+                                if(elem){
+                                    for(let i=0;i<elem.length;i++){
+                                        if($(elem[i]).width()){
+                                            formWidth=$(elem[i]).width();
+                                        }
+                                    }
+                                }
+                                if(!formWidth){
+                                    formWidth= sessionStorage.getItem('formWidth');
+                                }else{
+                                    sessionStorage.setItem('formWidth',formWidth)
+                                }
+                                let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+                                let elemW=$('.form-item-open-stow').parents('.layui-status');
+                                if(elemW){
+                                    for(let i=0;i<elemW.length;i++){
+                                        if($(elemW[i]).width()){
+                                            winWidth=$(elemW[i]).width();
+                                        }
+                                    }
+                                }
+                                if (formWidth + 130 > 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-27
                             }
                         });
                         $("#bizTotal").html(res.count);
@@ -795,6 +840,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                             return false;
                         }
                     });
+                    //lsq 业务视图页增加搜索按钮 2022-06-27
+                    $('#searchBizTreeTable').unbind('click').on('click', function () {
+                        renderTreeTable(busId, curTreeNode.data.id);
+                        return false;
+                    })
                     //选择资源状态
                     form.on('select(biz_treetable_resStatus)', function (data) {
                         renderTreeTable(busId, curTreeNode.data.id);

@@ -792,7 +792,7 @@ 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 formWidth = $('form[lay-filter="historywarning-form"] .layui-form-item').width();
         let winWidth = $('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
         if (formWidth + 100 > winWidth) {
             $('#openStowHis').css('display', 'inline-block')
@@ -812,6 +812,44 @@ 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('height', '50px');
             }
+        })*/
+        let formWidth =$('.form-item-open-stow').width();
+        let elem=$('.form-item-open-stow');
+        if(elem){
+            for(let i=0;i<elem.length;i++){
+                if($(elem[i]).width()){
+                    formWidth=$(elem[i]).width();
+                }
+            }
+        }
+        if(!formWidth){
+            formWidth= sessionStorage.getItem('formWidth');
+        }else{
+            sessionStorage.setItem('formWidth',formWidth)
+        }
+        let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+        let elemW=$('.form-item-open-stow').parents('.layui-status');
+        if(elemW){
+            for(let i=0;i<elemW.length;i++){
+                if($(elemW[i]).width()){
+                    winWidth=$(elemW[i]).width();
+                }
+            }
+        }
+        if (formWidth + 130 > 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
     });

@@ -307,6 +307,47 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                         }
 
                     }
+                    //start lsq 资源视图搜索条件太多，增加展开/收起的功能 2022-06-27
+                    let formWidth =$('.form-item-open-stow').width();
+                    let elem=$('.form-item-open-stow');
+                    if(elem){
+                        for(let i=0;i<elem.length;i++){
+                            if($(elem[i]).width()){
+                                formWidth=$(elem[i]).width();
+                            }
+                        }
+                    }
+                    if(!formWidth){
+                        formWidth= sessionStorage.getItem('formWidth');
+                    }else{
+                        sessionStorage.setItem('formWidth',formWidth)
+                    }
+                    let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
+                    let elemW=$('.form-item-open-stow').parents('.layui-status');
+                    if(elemW){
+                        for(let i=0;i<elemW.length;i++){
+                            if($(elemW[i]).width()){
+                                winWidth=$(elemW[i]).width();
+                            }
+                        }
+                    }
+                    debugger
+                    if (formWidth + 130 > 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-27
                 }
             });
             if (data.length > 0) {
@@ -708,7 +749,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 return false;
             }
         });
-
+        //lsq 资源视图页增加搜索按钮 2022-06-27
+        $('#searchResIndex').unbind('click').on('click', function () {
+            reloadTable();
+            return false;
+        })
         //资源详细信息
         function renderDetail(resId, resType) {
             $('#resIndexContent').hide();
@@ -820,6 +865,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                             return false;
                         }
                     });
+                    //lsq 资源视图页增加搜索按钮 2022-06-27
+                    $('#searchResTreeTable').unbind('click').on('click', function () {
+                        renderTreeTable(curTreeNode.data.id);
+                        return false;
+                    })
                     //选择资源状态
                     form.on('select(treetable_resStatus)', function (data) {
                         renderTreeTable(curTreeNode.data.id);
@@ -1722,7 +1772,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             });
         }
 
-
         return {getData: getCheckData};
     });
 });