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

@@ -317,7 +317,12 @@ layui.define(['common', 'sessions', 'commonDetail', 'mxClient', 'cascader'], fun
                                 //编辑拓扑
                                 //编辑拓扑
                                 $("#gotoedittopo").unbind('click').on("click", function () {
                                 $("#gotoedittopo").unbind('click').on("click", function () {
                                     var url = "/grapheditor-web/jgraph/grapheditor/index.html?access_token=" + accessToken + '&id=' + topoId;
                                     var url = "/grapheditor-web/jgraph/grapheditor/index.html?access_token=" + accessToken + '&id=' + topoId;
-                                    window.open(url);
+                                    // window.open(url);
+
+                                    window.parent.postMessage({
+                                        type: 'dialog',
+                                        message: {'params':{},'title':'编辑拓扑','url':url}
+                                    }, '*')
                                 });
                                 });
                             }
                             }
                         } else {
                         } else {
@@ -338,7 +343,12 @@ layui.define(['common', 'sessions', 'commonDetail', 'mxClient', 'cascader'], fun
                     // $(this).attr("lay-href","/mxgraph/setting/id="+topoId);
                     // $(this).attr("lay-href","/mxgraph/setting/id="+topoId);
                     //新版本
                     //新版本
                     var url = "/grapheditor-web/jgraph/grapheditor/index.html?access_token=" + accessToken + '&id=' + topoId;
                     var url = "/grapheditor-web/jgraph/grapheditor/index.html?access_token=" + accessToken + '&id=' + topoId;
-                    window.open(url);
+                    //window.open(url);
+debugger
+                    window.parent.postMessage({
+                        type: 'dialog',
+                        message: {'params':{},'title':'编辑拓扑','url':url}
+                    }, '*')
                 });
                 });
                 //全屏查看拓扑
                 //全屏查看拓扑
                 $("#gotoviewtopo").unbind("click").on("click", function () {
                 $("#gotoviewtopo").unbind("click").on("click", function () {