Merge branch 'master-v32-lushangqing' into 'master'

一体化页面跳转到活动告警页面的配置



See merge request !77

@@ -219,6 +219,17 @@ layui.extend({
     if(href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'){
         return location.hash = "/page/forward";
     }
+    //跳转到告警页面
+      let params=new URLSearchParams(location.search);
+      let [bizId]=[params.get('bizId')];
+      //活动告警页面
+      if( href.indexOf('&show=3') != -1 && pathURL !== '/alarm/activewarning'){
+          return location.hash = "/alarm/activewarning/bizId="+bizId;
+      }
+      //历史告警页面
+      if( href.indexOf('&show=4') != -1 && pathURL !== '/alarm/historywarning'){
+          return location.hash = "/alarm/historywarning/bizId="+bizId;
+      }
 
     //独立页面
     if(isIndPage || pathURL === '/user/login'|| pathURL === '/page/forward'){ //此处单独判断登入页，是为了兼容旧版（即未在 sessions.js 配置 indPage 的情况）