Merge branch 'master-v32-lushangqing' into 'master'
一体化页面跳转到活动告警页面的配置 See merge request !77
Showing
1 changed file
with
11 additions
and
0 deletions
@@ -219,6 +219,17 @@ layui.extend({ | @@ -219,6 +219,17 @@ layui.extend({ | ||
219 | if(href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'){ | 219 | if(href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'){ |
220 | return location.hash = "/page/forward"; | 220 | return location.hash = "/page/forward"; |
221 | } | 221 | } |
222 | + //跳转到告警页面 | ||
223 | + let params=new URLSearchParams(location.search); | ||
224 | + let [bizId]=[params.get('bizId')]; | ||
225 | + //活动告警页面 | ||
226 | + if( href.indexOf('&show=3') != -1 && pathURL !== '/alarm/activewarning'){ | ||
227 | + return location.hash = "/alarm/activewarning/bizId="+bizId; | ||
228 | + } | ||
229 | + //历史告警页面 | ||
230 | + if( href.indexOf('&show=4') != -1 && pathURL !== '/alarm/historywarning'){ | ||
231 | + return location.hash = "/alarm/historywarning/bizId="+bizId; | ||
232 | + } | ||
222 | 233 | ||
223 | //独立页面 | 234 | //独立页面 |
224 | if(isIndPage || pathURL === '/user/login'|| pathURL === '/page/forward'){ //此处单独判断登入页,是为了兼容旧版(即未在 sessions.js 配置 indPage 的情况) | 235 | if(isIndPage || pathURL === '/user/login'|| pathURL === '/page/forward'){ //此处单独判断登入页,是为了兼容旧版(即未在 sessions.js 配置 indPage 的情况) |
-
Please register or login to post a comment