Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-XuHaoJie
Showing
1 changed file
with
39 additions
and
35 deletions
@@ -10,49 +10,53 @@ | @@ -10,49 +10,53 @@ | ||
10 | <link rel="stylesheet" href="/start/layui/css/layui.css" media="all"> | 10 | <link rel="stylesheet" href="/start/layui/css/layui.css" media="all"> |
11 | <link rel="stylesheet" href="/src/style/css/menuIcon.css" media="all"> | 11 | <link rel="stylesheet" href="/src/style/css/menuIcon.css" media="all"> |
12 | <script> | 12 | <script> |
13 | - /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问'); | 13 | + /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问'); |
14 | </script> | 14 | </script> |
15 | </head> | 15 | </head> |
16 | <body> | 16 | <body> |
17 | - <div id="LAY_app"></div> | ||
18 | - <script src="/start/layui/layui.js"></script> | ||
19 | - <script> | ||
20 | - layui.use(['jquery'], function () { | ||
21 | - var $ = layui.jquery; | ||
22 | - // 读取配置文件 | ||
23 | - $.when( | ||
24 | - $.ajax({ | ||
25 | - url: '/config/getConfig', | ||
26 | - data: { | ||
27 | - configName: 'url' | ||
28 | - }, | ||
29 | - async: false | ||
30 | - }),$.ajax({ | ||
31 | - url: '/config/getConfig', | ||
32 | - data: { | ||
33 | - configName: 'config.audio' | ||
34 | - }, | ||
35 | - }), | ||
36 | - ).done(function (res1,res2) { | ||
37 | - sessionStorage.setItem('domainName', res1[0].gateway); | ||
38 | - sessionStorage.setItem('domainInspectionURI', res1[0].inspection_web); | ||
39 | - sessionStorage.setItem('domainAssetsManage', res1[0].assetsweb); | ||
40 | - sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor); | ||
41 | - sessionStorage.setItem('tingyun', res1[0].tingyun); | ||
42 | - sessionStorage.setItem('bigScreen', res1[0].bigScreen); | ||
43 | - sessionStorage.setItem('sxView', res1[0].sxView); | ||
44 | - sessionStorage.setItem('workflow', res1[0].workflow); | ||
45 | - sessionStorage.setItem('mp3', res2[0].mp3); | ||
46 | - sessionStorage.setItem('jimuReport', res1[0].jimuReport); | ||
47 | - sessionStorage.setItem('cmdbWeb', res1[0].cmdbWeb); | ||
48 | - }) | ||
49 | - }); | 17 | +<div id="LAY_app"></div> |
18 | +<script src="/start/layui/layui.js"></script> | ||
19 | +<script> | ||
20 | + layui.use(['jquery'], function () { | ||
21 | + var $ = layui.jquery; | ||
22 | + // 读取配置文件 | ||
23 | + $.when( | ||
24 | + $.ajax({ | ||
25 | + url: '/config/getConfig', | ||
26 | + data: { | ||
27 | + configName: 'url' | ||
28 | + }, | ||
29 | + async: false | ||
30 | + }),$.ajax({ | ||
31 | + url: '/config/getConfig', | ||
32 | + data: { | ||
33 | + configName: 'config.audio' | ||
34 | + }, | ||
35 | + }), | ||
36 | + ).done(function (res1,res2) { | ||
37 | + sessionStorage.setItem('domainName', res1[0].gateway); | ||
38 | + sessionStorage.setItem('domainInspectionURI', res1[0].inspection_web); | ||
39 | + sessionStorage.setItem('domainAssetsManage', res1[0].assetsweb); | ||
40 | + sessionStorage.setItem('graphEditorOrigin', res1[0].mxgraph_editor); | ||
41 | + sessionStorage.setItem('tingyun', res1[0].tingyun); | ||
42 | + sessionStorage.setItem('bigScreen', res1[0].bigScreen); | ||
43 | + sessionStorage.setItem('ythView', res1[0].ythView); | ||
44 | + sessionStorage.setItem('ajWeb', res1[0].ajWeb); | ||
45 | + //xwx add 读取业务健康度页面IP地址 2021-10-25 start | ||
46 | + sessionStorage.setItem('ywHealth', res1[0].ywHealth); | ||
47 | + //xwx add 读取业务健康度页面IP地址 2021-10-25 end | ||
48 | + sessionStorage.setItem('workflow', res1[0].workflow); | ||
49 | + sessionStorage.setItem('mp3', res2[0].mp3); | ||
50 | + sessionStorage.setItem('jimuReport', res1[0].jimuReport); | ||
51 | + sessionStorage.setItem('cmdbWeb', res1[0].cmdbWeb); | ||
52 | + }) | ||
53 | + }); | ||
50 | layui.config({ | 54 | layui.config({ |
51 | base: '../src/' //指定 layuiAdmin 项目路径,本地开发用 src,线上用 dist | 55 | base: '../src/' //指定 layuiAdmin 项目路径,本地开发用 src,线上用 dist |
52 | // ,version: '1.2.1'//运行环境用个固定版本号 | 56 | // ,version: '1.2.1'//运行环境用个固定版本号 |
53 | ,version: new Date().getTime()//本地开发环境,避免改动后的文件未及时生效,所以用时间戳作为版本 | 57 | ,version: new Date().getTime()//本地开发环境,避免改动后的文件未及时生效,所以用时间戳作为版本 |
54 | }).use('index'); | 58 | }).use('index'); |
55 | - </script> | 59 | +</script> |
56 | </body> | 60 | </body> |
57 | </html> | 61 | </html> |
58 | 62 |
-
Please register or login to post a comment