Merge remote-tracking branch 'origin/master-mj' into master-mj

@@ -103,4 +103,4 @@
     layui.use('backupmain', function (fn) {
         fn();
     });
-</script>
\ No newline at end of file
+</script>

@@ -26,8 +26,7 @@
                                     </div>
                                 </div>
                                 <button class="layui-btn layui-btn-normal" id="resTypeQueryBtn" type="button">
-                                    <!--lsq 查询按钮取消掉图标 2022-06-30-->
-                                    查询
+                                    搜索
                                 </button>
                             </div>
                         </form>
@@ -48,7 +47,7 @@
                             全部折叠
                         </button>
                     </div>
-                    <table id="restype-table" lay-filter="restypetable"></table>
+                    <table id="restype-table" lay-filter="restypetable" class="layui-table-view"></table>
                 </div>
             </div>
         </div>

@@ -56,7 +56,7 @@
                 </div>
             </div>
             <div class="layui-icon layadmin-tabs-control layui-icon-shrink-right topo-btn--right top5-btn"
-                 id="mxgraph-topo-alarm-panel-Btn" lay-tips="折叠Top5"></div>
+                 id="mxgraph-topo-alarm-panel-Btn" ></div>
             <div class="layui-icon layadmin-tabs-control layui-icon-next topo-btn--right hide" id="mxgraph-topoViewRightPanelBtn"
                  lay-tips="折叠业务面板"></div>
             <!--右侧拓扑列表-->

@@ -188,7 +188,7 @@
                         </div>
                         <div class="layui-row">
                             <div class="layui-col-md12">
-                                <div class="layui-btn-group">
+                                <div class="layui-btn-group newlog-tags">
                                     <button type="button" style="background-color: grey" class="layui-btn layui-btn-xs alaysis NETHARDWARE_" logType="Alarm">自身告警情况</button>
                                     <button type="button" style="background-color: grey" class="layui-btn layui-btn-xs alaysis NETHARDWARE_" logType="TrapAlarm">设备Trap告警</button>
                                     <button type="button" style="background-color: grey" class="layui-btn layui-btn-xs alaysis NETHARDWARE_" logType="ConfigChange">网络配置情况</button>

@@ -10,14 +10,16 @@
                        </el-tooltip>
                    </el-form-item>
                    <el-form-item>
-                       <el-dropdown>
+                      <!-- <el-dropdown>
                            <cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>
-                       </el-dropdown>
+                       </el-dropdown>-->
+                       <cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>
                    </el-form-item>
                    <el-form-item>
-                       <el-dropdown>
+                       <!--<el-dropdown>
                            <cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/>
-                       </el-dropdown>
+                       </el-dropdown>-->
+                       <cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/>
                    </el-form-item>
                    <el-form-item>
                        <el-button @click="handleQuery" :size="$global.elementConfig.size.button" type="primary">查询</el-button>