monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a1ee5b9326713e20e052c1caace443548bb73487 2 parents 8f94ecaf f7b54e64

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

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



See merge request !937
Inline Side-by-side
Showing 4 changed files with 9 additions and 6 deletions
@@ -183,6 +183,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -183,6 +183,8 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
183 $(".favorite-reslist").hide(); 183 $(".favorite-reslist").hide();
184 $(".favoriteListTable").hide(); 184 $(".favoriteListTable").hide();
185 $(".empty").show(); 185 $(".empty").show();
  186 + //收藏夹为空时显示添加资源
  187 + $(".favorite-reslist-add").show();
186 loadFavoriteList(id); 188 loadFavoriteList(id);
187 } 189 }
188 //反射面包屑选中,先清空所有选中状态 joke add 20211203 190 //反射面包屑选中,先清空所有选中状态 joke add 20211203
@@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
24 </div> 24 </div>
25 </div> 25 </div>
26 <!--start lsq 搜索按钮位置调整 2022-06-07--> 26 <!--start lsq 搜索按钮位置调整 2022-06-07-->
27 - <div class="layui-form-item" style="display: flex;align-items: center;"> 27 + <div class="layui-form-item" style="display: flex;align-items: flex-start;">
28 <label class="layui-form-label" style="height:40px;">用户绑定</label> 28 <label class="layui-form-label" style="height:40px;">用户绑定</label>
29 - <!-- <div class="layui-input-block tags-input" style="height: auto">-->  
30 - <div class=" tags-input" style="height: 38px;">  
31 - <div class="tags" id="selecte_usergroup_id_user"></div> 29 + <!-- lsq 样式优化-高度自动适应 2022-08-30-->
  30 + <div class=" tags-input" style="min-height:38px;height: auto;">
  31 + <div class="tags" style="height: auto;" id="selecte_usergroup_id_user"></div>
32 </div> 32 </div>
33 <!-- style="padding: 0!important;position: relative;top: -28px;left: 98%"【--> 33 <!-- style="padding: 0!important;position: relative;top: -28px;left: 98%"【-->
34 <div class="layui-form-mid layui-word-aux" style="margin-left:6px;"><i class="layui-icon form-btn-icon" 34 <div class="layui-form-mid layui-word-aux" style="margin-left:6px;"><i class="layui-icon form-btn-icon"
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 <li class="favorite-cards"><i class="layui-icon layui-icon-star" id="create_favorite" 78 <li class="favorite-cards"><i class="layui-icon layui-icon-star" id="create_favorite"
79 lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i> 79 lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i>
80 </li> 80 </li>
81 - <li class="favorite-reslist"><i class="layui-icon layui-icon-addition icon-addres" 81 + <li class="favorite-reslist favorite-reslist-add"><i class="layui-icon layui-icon-addition icon-addres"
82 id="add_favorite_res" lay-direction="4" 82 id="add_favorite_res" lay-direction="4"
83 lay-direction="4" 83 lay-direction="4"
84 lay-skin="primary" lay-tips="添加资源"></i></li> 84 lay-skin="primary" lay-tips="添加资源"></i></li>
@@ -70,7 +70,8 @@ @@ -70,7 +70,8 @@
70 lay-tips="资源总数：{{item.resNum }} <br>严重告警：{{item.serious}}<br>重要告警：{{item.important}}<br>一般告警：{{item.normal}}" 70 lay-tips="资源总数：{{item.resNum }} <br>严重告警：{{item.serious}}<br>重要告警：{{item.important}}<br>一般告警：{{item.normal}}"
71 data-serious="{{item.serious}}" data-important="{{item.important}}" 71 data-serious="{{item.serious}}" data-important="{{item.important}}"
72 data-normal="{{item.normal}}" lay-filter="layadmin-app"> 72 data-normal="{{item.normal}}" lay-filter="layadmin-app">
73 - <a href="javascript:;" lay-href="{{ '/biz/list/restype=' + item.resType }}">{{item.resTypeName}} 73 + <!--lsq 右上角点击跳转到活动告警 2022-08-31-->
  74 + <a href="javascript:;" lay-href="{{ '/alarm/activewarning/restype=' + item.resType }}">{{item.resTypeName}}
74 {{# if(alarmCount!=0){ }}<span 75 {{# if(alarmCount!=0){ }}<span
75 class="layui-badge">{{alarmCount}}</span> 76 class="layui-badge">{{alarmCount}}</span>
76 {{# } }} 77 {{# } }}