monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 15f91d7992b3178d61a18d1cbf8b9f86a313ea6c 2 parents da9a9f3e 79219aac

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

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 7 changed files with 23 additions and 11 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
@@ -21,6 +21,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer @@ -21,6 +21,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer
21 //获取权限列表 21 //获取权限列表
22 var checkList = common.checkPermission(accessToken); 22 var checkList = common.checkPermission(accessToken);
23 23
  24 + common.ddicSelect('mxgraph-topoType','JTOPO_TOPOTYPE',function (datalist) {
  25 + form.render('select');
  26 + });
24 27
25 //回车搜索 28 //回车搜索
26 $('#mxgraph-topolistkw').keydown(function (e) { 29 $('#mxgraph-topolistkw').keydown(function (e) {
@@ -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 {{# } }}
@@ -19,10 +19,7 @@ @@ -19,10 +19,7 @@
19 <div class="layui-input-inline layui-input-inline--long"> 19 <div class="layui-input-inline layui-input-inline--long">
20 <select id="mxgraph-topoType" lay-filter="mxgraph-topoType" 20 <select id="mxgraph-topoType" lay-filter="mxgraph-topoType"
21 lay-verify="required" name="mxgraph-topoType"> 21 lay-verify="required" name="mxgraph-topoType">
22 - <option value="">=拓扑类型=</option>  
23 - <option value="1">业务拓扑</option>  
24 - <option value="2">资源拓扑</option>  
25 - <option value="3">网络拓扑</option> 22 +
26 </select> 23 </select>
27 </div> 24 </div>
28 </div> 25 </div>
@@ -208,7 +208,7 @@ export default { @@ -208,7 +208,7 @@ export default {
208 busId: busTypeArr.value.join(','), 208 busId: busTypeArr.value.join(','),
209 configId: config.value, 209 configId: config.value,
210 page: 1, 210 page: 1,
211 - limit: 10 211 + limit: 10,
212 }) 212 })
213 213
214 let loadFirstList = (reload) => { 214 let loadFirstList = (reload) => {
@@ -229,6 +229,15 @@ export default { @@ -229,6 +229,15 @@ export default {
229 // if (!reload && tabSecondList.value.length > 0) { 229 // if (!reload && tabSecondList.value.length > 0) {
230 // return false; 230 // return false;
231 // } 231 // }
  232 + //lsq 未添加的列表中增加已添加列表的参数，未添加中不显示已添加的数据 2022-08-30
  233 + let addedId=[];
  234 + if(tabFirstList.value && tabFirstList.value.length>0){
  235 + tabFirstList.value.map(item=>{
  236 + addedId.push({resId:item.resId,kpiId:item.kpiId,flag:item.flag});
  237 + })
  238 + }
  239 + getParams.value.addedId=JSON.stringify(addedId) //lsq 已添加的id集
  240 +
232 proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams.value, function (res) { 241 proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams.value, function (res) {
233 if (res && res.success) { 242 if (res && res.success) {
234 proxy.count = res.count; 243 proxy.count = res.count;