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

杭州-首页-新增CMDB入口



See merge request !94

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

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

@@ -42,7 +42,6 @@
         sessionStorage.setItem('ythView', res1[0].ythView);
         sessionStorage.setItem('ythView', res1[0].ythView);
         //xwx add 读取业务健康度页面IP地址 2021-10-25 start
         //xwx add 读取业务健康度页面IP地址 2021-10-25 start
         sessionStorage.setItem('ywHealth', res1[0].ywHealth);
         sessionStorage.setItem('ywHealth', res1[0].ywHealth);
-        sessionStorage.setItem('CMDB', res1[0].CMDB);
         //xwx add 读取业务健康度页面IP地址 2021-10-25 end
         //xwx add 读取业务健康度页面IP地址 2021-10-25 end
         sessionStorage.setItem('workflow', res1[0].workflow);
         sessionStorage.setItem('workflow', res1[0].workflow);
         sessionStorage.setItem('mp3', res2[0].mp3);
         sessionStorage.setItem('mp3', res2[0].mp3);