diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
index fdd0ac8..6b94743 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
@@ -3165,7 +3165,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
addIconByValue: addIconByValue,
bindTips:function () {
// 基本信息悬浮提示
- $(".detail_base_info").mouseover(function () {
+ $(".detail_base_info").mouseenter(function () {
var that = this;
var targetId = $(this).data("id");
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});
window.detailTips = detailTips;
});
+ //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --start
+ $(".detail_base_info").mouseleave(function () {
+ layer.close(detailTips);
+ })
+ //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --end
// ,function () {
// layer.close(detailTips);
// }
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js b/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js
index 7134797..bc32ffe 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/favorites.js
@@ -69,23 +69,20 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
var favoriteId = $("#favorites_parentId").val();
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
var oldResIdList = [];
admin.req({
- url: common.domainName + '/api-web/favorites/res/list?access_token='+accessToken,
+ url: common.domainName + '/api-web/favorites/res/noList',
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 () {
layer.close(loading);
}
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/machineroomAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/machineroomAdd.js
index 72fc571..843d768 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/machineroomAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/machineroomAdd.js
@@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
machineroom.parentId = machineroom.select;
delete machineroom.select
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',
+ //xwx 2021/10/18 机房管理优化：新增报错404，列表排序优化 --end
contentType: 'application/json',
data: JSON.stringify(machineroom)
}).done(function (response) {
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphView.js b/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphView.js
index 1898dfc..c6c84b0 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphView.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/mxgraphView.js
@@ -121,6 +121,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
loadTopoResAlarmTop5(topoId);
//加载拓扑
+ //xwx 2021-10-19 拓扑视图下拉选择框默认回填 --start
admin.req({
url:common.domainName + '/api-web/mxgraph/findByJtopoId',
data:{flag:false,jtopoId:topoId}
@@ -133,6 +134,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
nodeInfo = res.map;
if (res.object.topoName) {
+ $("#mxgraph_topoTree").val(res.object.topoName);
// $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
}
// 拓扑背景及样式
@@ -305,6 +307,8 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
$('#viewGraphContainer').addClass('hide');
$('#newViewGraphContainer').removeClass('hide');
if (res.object.topoName) {
+ $("#mxgraph_topoTree").val(res.object.topoName);
+ //xwx 2021-10-29 拓扑视图下拉选择框默认回填 --end
// $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
}
$('#newViewGraphContainer iframe').attr('src', `${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}`);