Merge branch 'master-mj-joke' into 'master-mj'

feat:IP视图跳转详情页调整

feat:IP视图跳转详情页调整

See merge request !1093

@@ -194,7 +194,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
             if (pingEnable == '2') {  //如果pingEnable为2，则进入ping状态详情页面
                 commonDetail.openNewWin('template/detail/pingIndex', name, {'resId': resId});
             } else {  //否则进入监控详情页面
-                commonDetail.openDetail(resId, resType, name);
+                // commonDetail.openDetail(resId, resType, name);
+                //统一平台详情页
+                let win = window.parent;
+                if (win) {
+                    window.parent.postMessage({
+                        type: 'resDetail',
+                        message: {'params':{'resId':resId},'title':name}
+                    }, '*')
+                }
             }
         }
     });