Authored by 王涛

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

杭州-首页-增加CMDB入口



See merge request !92
@@ -20,6 +20,8 @@ url: @@ -20,6 +20,8 @@ url:
20 bigScreen: http://127.0.0.1:8081 20 bigScreen: http://127.0.0.1:8081
21 # 一体化视图 21 # 一体化视图
22 ythView: http://192.168.0.69:18089 22 ythView: http://192.168.0.69:18089
  23 + # cmdb
  24 + CMDB: http://192.168.0.68:80
23 # 业务健康度 25 # 业务健康度
24 ywHealth: http://80.12.92.117:83 26 ywHealth: http://80.12.92.117:83
25 #流程系统路径,当ssl.enabled=true时,http要改为https,并修改流程nginx的conf文件 27 #流程系统路径,当ssl.enabled=true时,http要改为https,并修改流程nginx的conf文件
@@ -673,6 +673,16 @@ layui.define(['view'], function(exports){ @@ -673,6 +673,16 @@ layui.define(['view'], function(exports){
673 , toDZSWJScreen: function () { 673 , toDZSWJScreen: function () {
674 window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token")); 674 window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
675 } 675 }
  676 + // xwx add 首页增加CMDB入口 2021-11-21
  677 + , toCMDB: function () {
  678 + var roles=sessionStorage.getItem('roles');
  679 + if (roles=='zichanyw' || roles=='zichanAdmin'){
  680 + window.open(sessionStorage.getItem("CMDB"));
  681 + }else{
  682 + layer.msg('当前用户没有权限', {icon: 0, time: 3000});
  683 + }
  684 +
  685 + }
676 686
677 //向右滚动页面标签 687 //向右滚动页面标签
678 , leftPage: function () { 688 , leftPage: function () {
@@ -74,6 +74,7 @@ @@ -74,6 +74,7 @@
74 <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> 74 <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>
75 <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> 75 <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>
76 <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> 76 <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>
  77 + <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>
77 </dl> 78 </dl>
78 </script> 79 </script>
79 </li> 80 </li>
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 sessionStorage.setItem('ythView', res1[0].ythView); 42 sessionStorage.setItem('ythView', res1[0].ythView);
43 //xwx add 读取业务健康度页面IP地址 2021-10-25 start 43 //xwx add 读取业务健康度页面IP地址 2021-10-25 start
44 sessionStorage.setItem('ywHealth', res1[0].ywHealth); 44 sessionStorage.setItem('ywHealth', res1[0].ywHealth);
  45 + sessionStorage.setItem('CMDB', res1[0].CMDB);
45 //xwx add 读取业务健康度页面IP地址 2021-10-25 end 46 //xwx add 读取业务健康度页面IP地址 2021-10-25 end
46 sessionStorage.setItem('workflow', res1[0].workflow); 47 sessionStorage.setItem('workflow', res1[0].workflow);
47 sessionStorage.setItem('mp3', res2[0].mp3); 48 sessionStorage.setItem('mp3', res2[0].mp3);