Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js =================================================================== diff -u -r24070 -r24376 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js (.../config.js) (revision 24070) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js (.../config.js) (revision 24376) @@ -43,5 +43,7 @@ // 终止 不删除装配任务 terminateInvoicePlanNotUpdatePackingTask:true, //允许一个篮筐装载多套外来器械 - multiForeignTousseIntoSameBasket:true + multiForeignTousseIntoSameBasket:true, + //主页版本(默认为ext.js,1为bootstrap,2为vue.js,......) + mainPageVersion : 1 } \ No newline at end of file Index: ssts-web/src/main/webapp/openSystemMainPage.jsp =================================================================== diff -u -r23160 -r24376 --- ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 23160) +++ ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 24376) @@ -71,8 +71,16 @@ } else { response.sendRedirect(ctx + "/logon.jsp?login_error=3"); } -} else { - response.sendRedirect(ctx + "/homepage/portalPage.jsp");//桌面版 +} else {//桌面版 + //如果主页版本为1,则跳转至bootstrap主页 + int mainPageVersion = CssdUtils.getSystemSetConfigByNameInt("mainPageVersion", 0); + if(mainPageVersion == 1){ + response.sendRedirect(ctx + "/dx-disinfectsystem/pages/index.jsp");//bootstrap主页 + }else if(mainPageVersion == 2){ + // + }else{ + response.sendRedirect(ctx + "/homepage/portalPage.jsp");//ext主页 + } } String reqUrl = request.getHeader("Referer");