Merge branch 'master-v32-xwx' into 'master'
拓补视图查看资源告警报错 See merge request !768
Showing
1 changed file
with
16 additions
and
5 deletions
@@ -1285,16 +1285,27 @@ layui.define(['xmSelect', 'md5'], function (exports) { | @@ -1285,16 +1285,27 @@ layui.define(['xmSelect', 'md5'], function (exports) { | ||
1285 | if (layHref.indexOf('=') !== -1) { | 1285 | if (layHref.indexOf('=') !== -1) { |
1286 | param = "=" + encodeURIComponent(layHref.split('=')[1]); | 1286 | param = "=" + encodeURIComponent(layHref.split('=')[1]); |
1287 | } | 1287 | } |
1288 | - alink.setAttribute("lay-href",layHref.split('=')[0] + param); | 1288 | + alink.setAttribute("lay-href", layHref.split('=')[0] + param); |
1289 | + document.body.appendChild(alink); | ||
1290 | + alink.click(); | ||
1291 | + document.body.removeChild(alink); | ||
1292 | + }, | ||
1293 | + openMxgraph: function (layHref) { | ||
1294 | + var alink = document.createElement('a'); | ||
1295 | + var param = ''; | ||
1296 | + if (layHref.indexOf('=') !== -1) { | ||
1297 | + param = "=" + encodeURIComponent(layHref.split('=')[1]); | ||
1298 | + } | ||
1299 | + alink.setAttribute("lay-href", layHref.split('=')[0] + param); | ||
1289 | admin.req({ | 1300 | admin.req({ |
1290 | - url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/'+layHref.split('=')[2], | 1301 | + url: obj.domainName + '/api-web/mxgraph/getJtopoInfoById/' + layHref.split('=')[2], |
1291 | success(response) { | 1302 | success(response) { |
1292 | //LH 修改 弹框展示子拓扑 | 1303 | //LH 修改 弹框展示子拓扑 |
1293 | layer.open({ | 1304 | layer.open({ |
1294 | - title:response.object.topoName, | 1305 | + title: response.object.topoName, |
1295 | type: 2, | 1306 | type: 2, |
1296 | - area:['90%','90%'], | ||
1297 | - content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id='+layHref.split('=')[2] ,//+ "&layout=organic", | 1307 | + area: ['90%', '90%'], |
1308 | + content: obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id=' + layHref.split('=')[2],//+ "&layout=organic", | ||
1298 | }) | 1309 | }) |
1299 | }, | 1310 | }, |
1300 | error() { | 1311 | error() { |
-
Please register or login to post a comment