Merge branch 'xy3yuan1015' into test

src/js/index.js

@@ -14,9 +14,12 @@ const {api} = require('./api.js')
 const {post,pageMap,delCookie,setCookie,setLocal,getCookie,focusMenuItem,getUrlArgObject} = require('./utils.js');
 let userInfo={};
 let isPlacefile = getCookie('isPlacefile')||1
+
 let passwordComplexity = getCookie('passwordComplexity')
 const hideLogo = getUrlArgObject("hideLg");
 const otherLogo = getUrlArgObject("adLg");
+const is3His = getUrlArgObject('is3His')
+console.log(is3His);
 const modalDom = `
       <p class="tips"><img src=${WarningIcon} /><span>为确保账号安全，请及时修改初始密码</span></p>
       <div class="modalAction">
@@ -402,6 +405,12 @@ function getMenu(){
           data.menuWrappers.splice(i,1);
           continue;
         }
+        for (let j = 0;j<data.menuWrappers[i].subMenuList.length;j++){
+          if(isPlacefile==='0'&& is3His && (data.menuWrappers[i].subMenuList[j].code==='YH-ZKK-BASYHGLYSZB_XQ' || data.menuWrappers[i].subMenuList[j].code==='YH-KSZR-BASYHGLYSZB_XQ')){
+            data.menuWrappers[i].subMenuList.splice(j,1);
+            continue;
+          }
+        }
         data.menuWrappers[i].isPlacefile = isPlacefile
       }
       initMenu(data.menuWrappers,data.userLoginDTO);

src/js/login.js

@@ -170,7 +170,7 @@ function sureLogin() {
         cacheCheckDatas(data.data.selRoles);
         const otherLogoPm = otherLogo ? '?adLg=1' : '';
         const hideLgPm = hideLogo ? '?hideLg=1' : '';
-        window.location.href = 'index.html' + hideLgPm + otherLogoPm;
+        window.location.href = 'index.html' + hideLgPm + otherLogoPm + "?is3His="+is3His;
       }, 600);
     } else {
         if(!is3His){