monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 48208e0fa5e9ba97a5d85e35aa95c0a6befcef62 1 parent 0eed1ee2

nacos 版本测试问题

Inline Side-by-side
Showing 5 changed files with 13 additions and 12 deletions
@@ -122,7 +122,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -122,7 +122,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
122 //加载业务信息 122 //加载业务信息
123 function loadBizInfo() { 123 function loadBizInfo() {
124 admin.req({ 124 admin.req({
125 - url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm' 125 + url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm?layout=' + sessionStorage.getItem("userLayout")
126 , type: "get" 126 , type: "get"
127 , async: false 127 , async: false
128 , done: function (data) { 128 , done: function (data) {
@@ -194,7 +194,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -194,7 +194,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
194 $("#mainindex_menubox").removeAttr("lay-href"); 194 $("#mainindex_menubox").removeAttr("lay-href");
195 layer.msg("暂未绑定资源！",{icon:7,time:3000}); 195 layer.msg("暂未绑定资源！",{icon:7,time:3000});
196 } 196 }
197 - break; 197 + break;
198 case 'd': 198 case 'd':
199 $("#mainindex_menubox").removeAttr("lay-href"); 199 $("#mainindex_menubox").removeAttr("lay-href");
200 renderDialtestInfo(bizId); 200 renderDialtestInfo(bizId);
@@ -1007,7 +1007,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1007,7 +1007,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1007 //刷新业务健康状态 1007 //刷新业务健康状态
1008 function refreshBizHealth() { 1008 function refreshBizHealth() {
1009 admin.req({ 1009 admin.req({
1010 - url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm' 1010 + url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm?layout=' + sessionStorage.getItem("userLayout")
1011 , type: "get" 1011 , type: "get"
1012 , done: function (data) { 1012 , done: function (data) {
1013 if (data.code === 0) { 1013 if (data.code === 0) {
@@ -1879,4 +1879,4 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1879,4 +1879,4 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1879 1879
1880 }); 1880 });
1881 1881
1882 -});  
  1882 +});
@@ -132,7 +132,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -132,7 +132,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
132 //加载业务信息 132 //加载业务信息
133 function loadBizInfo() { 133 function loadBizInfo() {
134 admin.req({ 134 admin.req({
135 - url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm' 135 + url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm?layout=' + sessionStorage.getItem("userLayout")
136 , type: "get" 136 , type: "get"
137 , done: function (data) { 137 , done: function (data) {
138 layer.close(loadIdx); 138 layer.close(loadIdx);
@@ -201,7 +201,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -201,7 +201,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
201 $("#mainindex_menubox").removeAttr("lay-href"); 201 $("#mainindex_menubox").removeAttr("lay-href");
202 layer.msg("暂未绑定资源！",{icon:7,time:3000}); 202 layer.msg("暂未绑定资源！",{icon:7,time:3000});
203 } 203 }
204 - break; 204 + break;
205 case 'd': 205 case 'd':
206 $("#mainindex_menubox").removeAttr("lay-href"); 206 $("#mainindex_menubox").removeAttr("lay-href");
207 renderDialtestInfo(bizId); 207 renderDialtestInfo(bizId);
@@ -941,7 +941,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -941,7 +941,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
941 //刷新业务健康状态 941 //刷新业务健康状态
942 function refreshBizHealth() { 942 function refreshBizHealth() {
943 admin.req({ 943 admin.req({
944 - url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm' 944 + url: common.domainName + '/api-web/home/business/getBusHealthResultByAlarm?layout=' + sessionStorage.getItem("userLayout")
945 , type: "get" 945 , type: "get"
946 , done: function (data) { 946 , done: function (data) {
947 if (data.code === 0) { 947 if (data.code === 0) {
@@ -1812,4 +1812,4 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1812,4 +1812,4 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1812 1812
1813 }); 1813 });
1814 1814
1815 -});  
  1815 +});
@@ -49,7 +49,8 @@ layui.extend({ @@ -49,7 +49,8 @@ layui.extend({
49 } 49 }
50 }); 50 });
51 } 51 }
52 - path = defaultIndex.substring(1).split('/'); 52 + // path = defaultIndex.substring(1).split('/');
  53 + path = defaultIndex.split('/');
53 54
54 // 根据不同角色 用户 展示不同首页 结束 55 // 根据不同角色 用户 展示不同首页 结束
55 } 56 }
@@ -201,7 +202,7 @@ layui.extend({ @@ -201,7 +202,7 @@ layui.extend({
201 ,container = view(setter.container) 202 ,container = view(setter.container)
202 ,pathURL = admin.correctRouter(router.path.join('/')) 203 ,pathURL = admin.correctRouter(router.path.join('/'))
203 ,isIndPage; 204 ,isIndPage;
204 - 205 +debugger
205 //检查是否属于独立页面 206 //检查是否属于独立页面
206 layui.each(setter.indPage, function(index, item){ 207 layui.each(setter.indPage, function(index, item){
207 if(pathURL === item){ 208 if(pathURL === item){
@@ -12,7 +12,7 @@ server: @@ -12,7 +12,7 @@ server:
12 key-store-password: Hg0801.. 12 key-store-password: Hg0801..
13 key-password: Hg0801.. 13 key-password: Hg0801..
14 url: 14 url:
15 - gateway: http://192.168.0.41:8080 15 + gateway: http://127.0.0.1:8080
16 inspection_web: http://127.0.0.1:8082 16 inspection_web: http://127.0.0.1:8082
17 assetsweb: http://127.0.0.1:8082 17 assetsweb: http://127.0.0.1:8082
18 mxgraph_editor: http://127.0.0.1:8085 18 mxgraph_editor: http://127.0.0.1:8085
@@ -12,7 +12,7 @@ server: @@ -12,7 +12,7 @@ server:
12 key-store-password: Hg0801.. 12 key-store-password: Hg0801..
13 key-password: Hg0801.. 13 key-password: Hg0801..
14 url: 14 url:
15 - gateway: http://127.0.0.1:8080 15 + gateway: https://192.168.0.41:8080
16 inspection_web: http://127.0.0.1:8082 16 inspection_web: http://127.0.0.1:8082
17 assetsweb: http://127.0.0.1:8082 17 assetsweb: http://127.0.0.1:8082
18 mxgraph_editor: http://127.0.0.1:8085 18 mxgraph_editor: http://127.0.0.1:8085