Merge branch 'master-v32-xwx' into 'master'

通知统计弹框页面出现横向滚动条



See merge request !731

@@ -79,7 +79,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
         //lsq 弹框打开更多 2022-06-21
         //lsq 弹框打开更多 2022-06-21
         function queryData(title, data) {
         function queryData(title, data) {
             let html = `
             let html = `
-            <div class="pie-chart pie-chart-custom" id="more_notice" style="height: 60vh"></div>
+            <div class="pie-chart pie-chart-custom" id="more_notice" style="height: 60vh;overflow:hidden"></div>
             `
             `
             layer.open({
             layer.open({
                 type: 1
                 type: 1

@@ -164,8 +164,8 @@
                 </div>
                 </div>
                 <div class="layui-card-body">
                 <div class="layui-card-body">
                     <div>
                     <div>
-                        <input type="search" placeholder="搜索..." id="bizInputSearch" autocomplete="off" class="layui-input layui-input-search" style="width: 180px">
-                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="bizSearch" style="width: 50px;height: 30px;margin-top: -6px;">搜索</button>
+                        <input type="search" placeholder="搜索..."  lay-tips="关键字检索包含： </br>资源名称</br>ip地址</br>资源类型</br>操作系统类型" id="bizInputSearch" autocomplete="off" class="layui-input layui-input-search" style="width: 180px">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="bizSearch" style="width: 50px;height: 30px;margin-top: -6px;">查询</button>
                     </div>
                     </div>
                     <div id="bizindextree"></div>
                     <div id="bizindextree"></div>
                 </div>
                 </div>

@@ -275,8 +275,8 @@
 
 
                 <div class="layui-card-body">
                 <div class="layui-card-body">
                     <div>
                     <div>
-                        <input type="search" placeholder="搜索..." autocomplete="off" id="inputSearch"  class="layui-input layui-input-search" style="width: 180px">
-                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="resSearch" style="width: 50px;height: 30px;margin-top: -6px;">搜索</button>
+                        <input type="search" placeholder="搜索..." autocomplete="off" lay-tips="关键字检索包含： </br>资源名称</br>ip地址</br>资源类型</br>操作系统类型"  id="inputSearch"  class="layui-input layui-input-search" style="width: 180px">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="resSearch" style="width: 50px;height: 30px;margin-top: -6px;">查询</button>
                     </div>
                     </div>
                     <div id="resindextree"></div>
                     <div id="resindextree"></div>
                 </div>
                 </div>