Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

@@ -3165,7 +3165,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
         addIconByValue: addIconByValue,
         addIconByValue: addIconByValue,
         bindTips:function () {
         bindTips:function () {
             // 基本信息悬浮提示
             // 基本信息悬浮提示
-            $(".detail_base_info").mouseover(function () {
+            $(".detail_base_info").mouseenter(function () {
                 var that = this;
                 var that = this;
                 var targetId = $(this).data("id");
                 var targetId = $(this).data("id");
                 var direction = $(this).data('direction');
                 var direction = $(this).data('direction');
@@ -3181,6 +3181,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
                 detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
                 window.detailTips = detailTips;
                 window.detailTips = detailTips;
             });
             });
+            //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --start
+            $(".detail_base_info").mouseleave(function () {
+                layer.close(detailTips);
+            })
+            //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --end
         // ,function () {
         // ,function () {
         //         layer.close(detailTips);
         //         layer.close(detailTips);
         //     }
         //     }

@@ -69,23 +69,20 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
             var favoriteId = $("#favorites_parentId").val();
             var favoriteId = $("#favorites_parentId").val();
             var resIds = [];
             var resIds = [];
 
 
-            var param={
-                favId: favoriteId,
-                resName: $("#keyword_id").val(),
-                resType: $("#fav_reslist_restype").val(),
-                busId: $("#fav_reslist_resListBizTypes").val(),
-                resHealth: $("#fav_reslist_resStatus").val(),
-                page: -1,
-                limit: 20
-            }
+            //xwx 2021/10/19 收藏夹重复添加时，列表上展示重复数据，添加资源时列表数量不对  --start
             //获取所有资源id
             //获取所有资源id
             var oldResIdList = [];
             var oldResIdList = [];
             admin.req({
             admin.req({
-                url: common.domainName + '/api-web/favorites/res/list?access_token='+accessToken,
+                url: common.domainName + '/api-web/favorites/res/noList',
                 async: false,
                 async: false,
-                type:'post',
-                data: JSON.stringify(param),
-                contentType: "application/json;charset=UTF-8",
+                data: {
+                    favId: favoriteId,
+                    resName: $("#keyword_id").val(),
+                    resType: $("#fav_reslist_restype").val(),
+                    busId: $("#fav_reslist_resListBizTypes").val(),
+                    resHealth: $("#fav_reslist_resStatus").val()
+                },
+                //xwx 2021/10/19 收藏夹重复添加时，列表上展示重复数据，添加资源时列表数量不对  --end
                 error: function () {
                 error: function () {
                     layer.close(loading);
                     layer.close(loading);
                 }
                 }

@@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             machineroom.parentId = machineroom.select;
             machineroom.parentId = machineroom.select;
             delete machineroom.select
             delete machineroom.select
             admin.req({
             admin.req({
-                url: domainName + '/api-web/manage/machineroom/save?access_token=' + accessToken,
+                //xwx 2021/10/18 机房管理优化：新增报错404，列表排序优化  --start
+                url: domainName + '/api-web/manage/machineroom/importSave?access_token=' + accessToken,
                 type: 'POST',
                 type: 'POST',
+                //xwx 2021/10/18 机房管理优化：新增报错404，列表排序优化  --end
                 contentType: 'application/json',
                 contentType: 'application/json',
                 data: JSON.stringify(machineroom)
                 data: JSON.stringify(machineroom)
             }).done(function (response) {
             }).done(function (response) {

@@ -121,6 +121,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
                     loadTopoResAlarmTop5(topoId);
                     loadTopoResAlarmTop5(topoId);
 
 
                     //加载拓扑
                     //加载拓扑
+                    //xwx 2021-10-19 拓扑视图下拉选择框默认回填 --start
                     admin.req({
                     admin.req({
                         url:common.domainName + '/api-web/mxgraph/findByJtopoId',
                         url:common.domainName + '/api-web/mxgraph/findByJtopoId',
                         data:{flag:false,jtopoId:topoId}
                         data:{flag:false,jtopoId:topoId}
@@ -133,6 +134,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
                             nodeInfo = res.map;
                             nodeInfo = res.map;
 
 
                             if (res.object.topoName) {
                             if (res.object.topoName) {
+                                $("#mxgraph_topoTree").val(res.object.topoName);
                                 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
                                 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
                             }
                             }
                             // 拓扑背景及样式
                             // 拓扑背景及样式
@@ -305,6 +307,8 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
                             $('#viewGraphContainer').addClass('hide');
                             $('#viewGraphContainer').addClass('hide');
                             $('#newViewGraphContainer').removeClass('hide');
                             $('#newViewGraphContainer').removeClass('hide');
                             if (res.object.topoName) {
                             if (res.object.topoName) {
+                                $("#mxgraph_topoTree").val(res.object.topoName);
+                                //xwx 2021-10-29 拓扑视图下拉选择框默认回填  --end
                                 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
                                 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
                             }
                             }
                             $('#newViewGraphContainer iframe').attr('src', `${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}`);
                             $('#newViewGraphContainer iframe').attr('src', `${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}`);