Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r23729 -r24805 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 23729) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 24805) @@ -817,7 +817,7 @@ return returnContent; } - //如果不是使用版本2或者3,则隐藏申请外来器械图标 + //如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标 if (itemId == 'foreignTousseApplication' && !sstsConfig.enableForeignTousseApplicationDesktopIcon){ return returnContent; } @@ -838,7 +838,24 @@ return returnContent; } + //如果启用设备维护个人桌面图标显示 + if(sstsConfig.showDeviceMaintenanceDesktopIcon){ + //设备维护(之前的非自定义配置的版本) + if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus){ + return returnContent; + } + + //设备维护(自定义配置版本) + if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus){ + return returnContent; + } + }else{ + if(itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom'){ + return returnContent; + } + } + var supplyRoomRecall = false; if(itemId == "recallRecord"){ if(SSTS_RecallRecord_Menu == false){