新增日志页面嵌套监控的公共方法，后续根据需求合入公共代码

-layui.define(['sessions', 'form', 'common'],function (exports) {
+layui.define(['sessions', 'form', 'common'], function (exports) {
     //登录相关模块,对外暴露的接口
     //登录相关模块,对外暴露的接口
     exports('pageLog', function () {
     exports('pageLog', function () {
 
 
@@ -34,12 +34,12 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
 
 
         try {
         try {
             logPage();
             logPage();
-        }catch (e) {
+        } catch (e) {
             err()
             err()
         }
         }
 
 
 
 
-        function err(){
+        function err() {
             layer.msg('没有权限！', {icon: 5, time: 500});
             layer.msg('没有权限！', {icon: 5, time: 500});
             $('#text').text("没有权限！")
             $('#text').text("没有权限！")
             layer.closeAll();
             layer.closeAll();
@@ -52,14 +52,14 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
          * http://xxxxxx:8088/?show=0&Authorization=token&url=alarm/activewarning#/page/forward
          * http://xxxxxx:8088/?show=0&Authorization=token&url=alarm/activewarning#/page/forward
          * @constructor
          * @constructor
          */
          */
-        function logPage(){
+        function logPage() {
             var index = layer.load(2);  //加载层
             var index = layer.load(2);  //加载层
             // 日志token
             // 日志token
-            var tokenStr = getUrlParam("Authorization").replace('Bearer%20','').replace('Bearer ','');
+            var tokenStr = getUrlParam("Authorization").replace('Bearer%20', '').replace('Bearer ', '');
             // 跳转地址
             // 跳转地址
             var url = getUrlParam("url").split('#/')[0];
             var url = getUrlParam("url").split('#/')[0];
-            if(url.indexOf('(')!=-1 && url.indexOf(')')!=-1 ){
-                url = url.replace('(','?').replace(':','=').replace(',','&').replace(')','');
+            if (url.indexOf('(') != -1 && url.indexOf(')') != -1) {
+                url = url.replace('(', '?').replace(':', '=').replace(',', '&').replace(')', '');
             }
             }
 
 
             // 日志地址
             // 日志地址
@@ -72,32 +72,32 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                 async: false,
                 async: false,
                 success(response) {
                 success(response) {
                     //debugger
                     //debugger
-                    if(response.gateway){
+                    if (response.gateway) {
                         //logApi = response.gateway;
                         //logApi = response.gateway;
                     }
                     }
                 }
                 }
             });
             });
 
 
             var api = logApi + "/api-user/users/getUserByToken";
             var api = logApi + "/api-user/users/getUserByToken";
-            $.ajax(api,{
-                data:{
+            $.ajax(api, {
+                data: {
                     "access_token": tokenStr
                     "access_token": tokenStr
                 },
                 },
                 headers: {
                 headers: {
-                    'authorization': 'Bearer '+tokenStr,
+                    'authorization': 'Bearer ' + tokenStr,
                 },
                 },
                 //dataType:'json',//服务器返回json格式数据
                 //dataType:'json',//服务器返回json格式数据
-                type:'get',//HTTP请求类型
-                timeout:30000,//超时时间设置为30秒；
+                type: 'get',//HTTP请求类型
+                timeout: 30000,//超时时间设置为30秒；
                 //contentType: 'application/x-www-form-urlencoded',
                 //contentType: 'application/x-www-form-urlencoded',
-                success:function(rsp){
-                    if(rsp.code == 0){
+                success: function (rsp) {
+                    if (rsp.code == 0) {
                         var name = rsp.object.username;
                         var name = rsp.object.username;
                         try {
                         try {
-                            var SubtleCrypto=new SubtleCrypto();
+                            var SubtleCrypto = new SubtleCrypto();
                             var pwd = SubtleCrypto.decrypt(rsp.object.password);
                             var pwd = SubtleCrypto.decrypt(rsp.object.password);
                             console.log(pwd);
                             console.log(pwd);
-                        }catch (e) {
+                        } catch (e) {
 
 
                         }
                         }
 
 
@@ -113,7 +113,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
 
 
 
 
                         $.ajax({
                         $.ajax({
-                            url:  common.domainName + '/api-auth/oauth/token',
+                            url: common.domainName + '/api-auth/oauth/token',
                             data: field,
                             data: field,
                             type: 'POST',
                             type: 'POST',
                             dataType: 'JSON',
                             dataType: 'JSON',
@@ -135,13 +135,11 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                                     localStorage.setItem("loginUrl", location.href);
                                     localStorage.setItem("loginUrl", location.href);
 
 
                                     //登入成功的提示与跳转
                                     //登入成功的提示与跳转
-                                    if(url.indexOf("ajConfig")!=-1){
-                                        if(url.indexOf("ajConfig/view")!=-1){
-                                            window.location = window.location.origin + '/vue3/index.html#/' + url;
-                                        }else {
-                                            window.location = window.location.origin + '/vue3/index.html?show=0&access_token=' + data.access_token + '#/' + url;
-                                        }
-                                    }else {
+                                    if (url.indexOf("ajConfig") != -1 && url.indexOf("ajConfig/view") != -1) {
+
+                                        window.location = window.location.origin + '/vue3/index.html#/' + url;
+
+                                    } else {
                                         window.location = window.location.origin + '/start/index.html?show=0&access_token=' + data.access_token + '#/' + url;
                                         window.location = window.location.origin + '/start/index.html?show=0&access_token=' + data.access_token + '#/' + url;
                                     }
                                     }
 
 
@@ -155,7 +153,7 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                         });
                         });
                     }
                     }
                 },
                 },
-                error:function(xhr,type,errorThrown){
+                error: function (xhr, type, errorThrown) {
                     err();
                     err();
                 }
                 }
             });
             });

@@ -6,15 +6,13 @@
 
 
 
 
 var global = {};
 var global = {};
-console.log(window.parent);
-if (window.parent.frames[0] != window.self) {
+if (window.parent!= window.top) {
     global.layui = window.parent.layui;
     global.layui = window.parent.layui;
     global.layer = window.parent.layer;
     global.layer = window.parent.layer;
 }else {
 }else {
     global.layui = undefined;
     global.layui = undefined;
     global.layer = undefined;
     global.layer = undefined;
 }
 }
-
 global.common = {
 global.common = {
     getUserName : function (){
     getUserName : function (){
         return localStorage.getItem('lgn');
         return localStorage.getItem('lgn');