monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit adcc6becb72d0227328d847ede1ce01172a32acf 2 parents f649b865 0c36b1ed

Merge branch 'master-v32-xwx' into 'master' 

杭州-bug修改-资源视图详情页基本信息悬浮提示无法关闭 杭州-bug修改-收藏夹重复添加时，列表上展示重复数据，添加资源时列表数量不对 杭州-bug修改-机房管理新增报错404优化  杭州-bug修改-拓扑视图下拉选择框默认回填



See merge request !14
Inline Side-by-side
Showing 4 changed files with 23 additions and 15 deletions
@@ -3165,7 +3165,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3165,7 +3165,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3165 addIconByValue: addIconByValue, 3165 addIconByValue: addIconByValue,
3166 bindTips:function () { 3166 bindTips:function () {
3167 // 基本信息悬浮提示 3167 // 基本信息悬浮提示
3168 - $(".detail_base_info").mouseover(function () { 3168 + $(".detail_base_info").mouseenter(function () {
3169 var that = this; 3169 var that = this;
3170 var targetId = $(this).data("id"); 3170 var targetId = $(this).data("id");
3171 var direction = $(this).data('direction'); 3171 var direction = $(this).data('direction');
@@ -3181,6 +3181,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3181,6 +3181,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3181 detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true}); 3181 detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
3182 window.detailTips = detailTips; 3182 window.detailTips = detailTips;
3183 }); 3183 });
  3184 + //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --start
  3185 + $(".detail_base_info").mouseleave(function () {
  3186 + layer.close(detailTips);
  3187 + })
  3188 + //xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --end
3184 // ,function () { 3189 // ,function () {
3185 // layer.close(detailTips); 3190 // layer.close(detailTips);
3186 // } 3191 // }
@@ -69,23 +69,20 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -69,23 +69,20 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
69 var favoriteId = $("#favorites_parentId").val(); 69 var favoriteId = $("#favorites_parentId").val();
70 var resIds = []; 70 var resIds = [];
71 71
72 - var param={  
73 - favId: favoriteId,  
74 - resName: $("#keyword_id").val(),  
75 - resType: $("#fav_reslist_restype").val(),  
76 - busId: $("#fav_reslist_resListBizTypes").val(),  
77 - resHealth: $("#fav_reslist_resStatus").val(),  
78 - page: -1,  
79 - limit: 20  
80 - } 72 + //xwx 2021/10/19 收藏夹重复添加时，列表上展示重复数据，添加资源时列表数量不对 --start
81 //获取所有资源id 73 //获取所有资源id
82 var oldResIdList = []; 74 var oldResIdList = [];
83 admin.req({ 75 admin.req({
84 - url: common.domainName + '/api-web/favorites/res/list?access_token='+accessToken, 76 + url: common.domainName + '/api-web/favorites/res/noList',
85 async: false, 77 async: false,
86 - type:'post',  
87 - data: JSON.stringify(param),  
88 - contentType: "application/json;charset=UTF-8", 78 + data: {
  79 + favId: favoriteId,
  80 + resName: $("#keyword_id").val(),
  81 + resType: $("#fav_reslist_restype").val(),
  82 + busId: $("#fav_reslist_resListBizTypes").val(),
  83 + resHealth: $("#fav_reslist_resStatus").val()
  84 + },
  85 + //xwx 2021/10/19 收藏夹重复添加时，列表上展示重复数据，添加资源时列表数量不对 --end
89 error: function () { 86 error: function () {
90 layer.close(loading); 87 layer.close(loading);
91 } 88 }
@@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -111,8 +111,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
111 machineroom.parentId = machineroom.select; 111 machineroom.parentId = machineroom.select;
112 delete machineroom.select 112 delete machineroom.select
113 admin.req({ 113 admin.req({
114 - url: domainName + '/api-web/manage/machineroom/save?access_token=' + accessToken, 114 + //xwx 2021/10/18 机房管理优化：新增报错404，列表排序优化 --start
  115 + url: domainName + '/api-web/manage/machineroom/importSave?access_token=' + accessToken,
115 type: 'POST', 116 type: 'POST',
  117 + //xwx 2021/10/18 机房管理优化：新增报错404，列表排序优化 --end
116 contentType: 'application/json', 118 contentType: 'application/json',
117 data: JSON.stringify(machineroom) 119 data: JSON.stringify(machineroom)
118 }).done(function (response) { 120 }).done(function (response) {
@@ -121,6 +121,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio @@ -121,6 +121,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
121 loadTopoResAlarmTop5(topoId); 121 loadTopoResAlarmTop5(topoId);
122 122
123 //加载拓扑 123 //加载拓扑
  124 + //xwx 2021-10-19 拓扑视图下拉选择框默认回填 --start
124 admin.req({ 125 admin.req({
125 url:common.domainName + '/api-web/mxgraph/findByJtopoId', 126 url:common.domainName + '/api-web/mxgraph/findByJtopoId',
126 data:{flag:false,jtopoId:topoId} 127 data:{flag:false,jtopoId:topoId}
@@ -133,6 +134,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio @@ -133,6 +134,7 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
133 nodeInfo = res.map; 134 nodeInfo = res.map;
134 135
135 if (res.object.topoName) { 136 if (res.object.topoName) {
  137 + $("#mxgraph_topoTree").val(res.object.topoName);
136 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName); 138 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
137 } 139 }
138 // 拓扑背景及样式 140 // 拓扑背景及样式
@@ -305,6 +307,8 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio @@ -305,6 +307,8 @@ layui.define(['common','sessions','commonDetail','mxClient','cascader'], functio
305 $('#viewGraphContainer').addClass('hide'); 307 $('#viewGraphContainer').addClass('hide');
306 $('#newViewGraphContainer').removeClass('hide'); 308 $('#newViewGraphContainer').removeClass('hide');
307 if (res.object.topoName) { 309 if (res.object.topoName) {
  310 + $("#mxgraph_topoTree").val(res.object.topoName);
  311 + //xwx 2021-10-29 拓扑视图下拉选择框默认回填 --end
308 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName); 312 // $("#mxgraph-topoTitle").text(" - " + res.object.topoName);
309 } 313 }
310 $('#newViewGraphContainer iframe').attr('src', `${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}`); 314 $('#newViewGraphContainer iframe').attr('src', `${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}`);