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

…eb into master-500-dev-xwx

@@ -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

@@ -21,6 +21,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer
         //获取权限列表
         var checkList = common.checkPermission(accessToken);
 
+        common.ddicSelect('mxgraph-topoType','JTOPO_TOPOTYPE',function (datalist) {
+            form.render('select');
+        });
 
         //回车搜索
         $('#mxgraph-topolistkw').keydown(function (e) {

@@ -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>
                             {{# } }}

@@ -19,10 +19,7 @@
                                     <div class="layui-input-inline layui-input-inline--long">
                                         <select id="mxgraph-topoType" lay-filter="mxgraph-topoType"
                                                 lay-verify="required" name="mxgraph-topoType">
-                                            <option value="">=拓扑类型=</option>
-                                            <option value="1">业务拓扑</option>
-                                            <option value="2">资源拓扑</option>
-                                            <option value="3">网络拓扑</option>
+
                                         </select>
                                     </div>
                                 </div>

@@ -208,7 +208,7 @@ export default {
             busId: busTypeArr.value.join(','),
             configId: config.value,
             page: 1,
-            limit: 10
+            limit: 10,
         })
 
         let loadFirstList = (reload) => {
@@ -229,6 +229,15 @@ export default {
             // if (!reload && tabSecondList.value.length > 0) {
             //     return false;
             // }
+            //lsq 未添加的列表中增加已添加列表的参数，未添加中不显示已添加的数据 2022-08-30
+            let addedId=[];
+            if(tabFirstList.value && tabFirstList.value.length>0){
+                tabFirstList.value.map(item=>{
+                    addedId.push({resId:item.resId,kpiId:item.kpiId,flag:item.flag});
+                })
+            }
+            getParams.value.addedId=JSON.stringify(addedId) //lsq 已添加的id集
+
             proxy.$http.get(`/api-web/ContrastAnalysis/notAdded`, getParams.value, function (res) {
                 if (res && res.success) {
                     proxy.count = res.count;