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

杭州-首页-增加CMDB入口



See merge request !92

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

@@ -673,6 +673,16 @@ layui.define(['view'], function(exports){
         , toDZSWJScreen: function () {
             window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
         }
+        // xwx add 首页增加CMDB入口 2021-11-21
+        , toCMDB: function () {
+            var roles=sessionStorage.getItem('roles');
+            if (roles=='zichanyw' || roles=='zichanAdmin'){
+                window.open(sessionStorage.getItem("CMDB"));
+            }else{
+                layer.msg('当前用户没有权限', {icon: 0, time: 3000});
+            }
+
+        }
 
         //向右滚动页面标签
         , leftPage: function () {

@@ -74,6 +74,7 @@
                         <dd layadmin-event="toDZSWJScreen"  style="text-align: left;"><a><img src="/src/style/img/icon-dianzishuiwuju.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;电子税务大屏</a></dd>
                         <dd layadmin-event="toYTHViewScreen"  style="text-align: left;"><a><img src="/src/style/img/icon-yitihuadaping.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;一体化视图</a></dd>
                         <dd layadmin-event="toBiZhEalZhSYS"  style="text-align: left;"><a><img src="/src/style/img/icon-YWJKD.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;业务健康度</a></dd>
+                        <dd layadmin-event="toCMDB"  style="text-align: left;"><a><img src="/src/style/img/loading-mj.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;CMDB</a></dd>
                     </dl>
                 </script>
             </li>

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