Merge branch 'master-v32-xwx' into 'master'

杭州-跳转CMDB



See merge request !161

@@ -21,7 +21,7 @@ url:
   # 一体化视图
   ythView: http://192.168.0.69:18089
   # cmdb
-  cmdbWeb: http://192.168.0.68:80
+  cmdbWeb: http://192.168.0.68/#/index
   # 业务健康度
   ywHealth: http://80.12.92.117:83
   #流程系统路径，当ssl.enabled=true时，http要改为https,并修改流程nginx的conf文件

@@ -677,7 +677,7 @@ layui.define(['view'], function(exports){
         , toCMDB: function () {
             var roles=sessionStorage.getItem('roles');
             if (roles.indexOf('zichanyw') != -1 || roles.indexOf('zichanAdmin') != -1){
-                window.open(sessionStorage.getItem("cmdbWeb"));
+                window.open(sessionStorage.getItem("cmdbWeb")+ '&access_token=' + localStorage.getItem("access_token"));
             }else{
                 layer.msg('当前用户没有权限', {icon: 0, time: 3000});
             }