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

【1035】 【首页】应用资源类型右上角数字跳转到活动告警



See merge request !937

@@ -183,6 +183,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
                     $(".favorite-reslist").hide();
                     $(".favoriteListTable").hide();
                     $(".empty").show();
+                    //收藏夹为空时显示添加资源
+                    $(".favorite-reslist-add").show();
                     loadFavoriteList(id);
                 }
                 //反射面包屑选中,先清空所有选中状态  joke add 20211203

@@ -24,11 +24,11 @@
             </div>
         </div>
         <!--start lsq 搜索按钮位置调整 2022-06-07-->
-        <div class="layui-form-item" style="display: flex;align-items: center;">
+        <div class="layui-form-item" style="display: flex;align-items: flex-start;">
             <label class="layui-form-label" style="height:40px;">用户绑定</label>
-            <!--            <div class="layui-input-block tags-input" style="height: auto">-->
-            <div class=" tags-input" style="height: 38px;">
-                <div class="tags" id="selecte_usergroup_id_user"></div>
+            <!-- lsq 样式优化-高度自动适应 2022-08-30-->
+            <div class=" tags-input" style="min-height:38px;height: auto;">
+                <div class="tags" style="height: auto;" id="selecte_usergroup_id_user"></div>
             </div>
             <!-- style="padding: 0!important;position: relative;top: -28px;left: 98%"【-->
             <div class="layui-form-mid layui-word-aux" style="margin-left:6px;"><i class="layui-icon form-btn-icon"

@@ -78,7 +78,7 @@
                                 <li class="favorite-cards"><i class="layui-icon layui-icon-star" id="create_favorite"
                                                               lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i>
                                 </li>
-                                <li class="favorite-reslist"><i class="layui-icon layui-icon-addition icon-addres"
+                                <li class="favorite-reslist favorite-reslist-add"><i class="layui-icon layui-icon-addition icon-addres"
                                                                 id="add_favorite_res" lay-direction="4"
                                                                 lay-direction="4"
                                                                 lay-skin="primary" lay-tips="添加资源"></i></li>

@@ -70,7 +70,8 @@
                         lay-tips="资源总数：{{item.resNum }} <br>严重告警：{{item.serious}}<br>重要告警：{{item.important}}<br>一般告警：{{item.normal}}"
                         data-serious="{{item.serious}}" data-important="{{item.important}}"
                         data-normal="{{item.normal}}" lay-filter="layadmin-app">
-                        <a href="javascript:;" lay-href="{{ '/biz/list/restype=' + item.resType }}">{{item.resTypeName}}
+                        <!--lsq 右上角点击跳转到活动告警 2022-08-31-->
+                        <a href="javascript:;" lay-href="{{ '/alarm/activewarning/restype=' + item.resType }}">{{item.resTypeName}}
                             {{# if(alarmCount!=0){ }}<span
                                 class="layui-badge">{{alarmCount}}</span>
                             {{# } }}