Merge branch 'master-V32-LH' into 'master'

拓扑优化弹框



See merge request !372

@@ -1262,9 +1262,18 @@ layui.define(['xmSelect', 'md5'], function (exports) {
                 param = "=" + encodeURIComponent(layHref.split('=')[1]);
             }
             alink.setAttribute("lay-href",layHref.split('=')[0] + param);
-            document.body.appendChild(alink);
-            alink.click();
-            document.body.removeChild(alink);
+
+            //console.log("************",window.location.origin+'/#'+layHref.split('=')[0] + param)
+            //LH 修改 弹框展示子拓扑
+            layer.open({
+                title:'子拓扑',
+                type: 2,
+                area:['70%','90%'],
+                content:  obj.graphEditorOrigin + "/jgraph/grapheditor/viewer.html?access_token=" + localStorage.getItem('access_token') + '&id='+layHref.split('=')[2] + "&layout=organic",
+            })
+            // document.body.appendChild(alink);
+            // alink.click();
+            // document.body.removeChild(alink);
         },
 
         /**