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

@@ -58,6 +58,9 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
             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(')','');
+            }
 
 
             // 日志地址
             // 日志地址
             var logApi = 'http://192.168.0.44:8080';
             var logApi = 'http://192.168.0.44:8080';
@@ -89,10 +92,15 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                 //contentType: 'application/x-www-form-urlencoded',
                 //contentType: 'application/x-www-form-urlencoded',
                 success:function(rsp){
                 success:function(rsp){
                     if(rsp.code == 0){
                     if(rsp.code == 0){
-                        console.log(JSON.stringify(rsp.data));
                         var name = rsp.object.username;
                         var name = rsp.object.username;
-                        var pwd = common.Base64.decode(rsp.object.password);
-                        console.log(pwd);
+                        try {
+                            var SubtleCrypto=new SubtleCrypto();
+                            var pwd = SubtleCrypto.decrypt(rsp.object.password);
+                            console.log(pwd);
+                        }catch (e) {
+
+                        }
+
                         var field = {};
                         var field = {};
                         field.username = name;
                         field.username = name;
                         field.password = '123456';
                         field.password = '123456';
@@ -127,7 +135,15 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                                     localStorage.setItem("loginUrl", location.href);
                                     localStorage.setItem("loginUrl", location.href);
 
 
                                     //登入成功的提示与跳转
                                     //登入成功的提示与跳转
-                                    window.location = window.location.origin + '/start/index.html?show=0&access_token='+data.access_token+'#/'+url;
+                                    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 {
+                                        window.location = window.location.origin + '/start/index.html?show=0&access_token=' + data.access_token + '#/' + url;
+                                    }
 
 
                                 } else {
                                 } else {
                                     layer.msg('登录失败，请重试', {icon: 5, time: 500});
                                     layer.msg('登录失败，请重试', {icon: 5, time: 500});

@@ -6,9 +6,14 @@
 
 
 
 
 var global = {};
 var global = {};
-
-global.layui = window.parent.layui;
-global.layer = window.parent.layer;
+console.log(window.parent);
+if (window.parent.frames[0] != window.self) {
+    global.layui = window.parent.layui;
+    global.layer = window.parent.layer;
+}else {
+    global.layui = undefined;
+    global.layer = undefined;
+}
 
 
 global.common = {
 global.common = {
     getUserName : function (){
     getUserName : function (){