Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r38039 -r38040 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38039) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38040) @@ -621,6 +621,13 @@ + + + + + + + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r38039 -r38040 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 38039) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 38040) @@ -1321,6 +1321,36 @@ } /** + * 《ZSRY-60:设备巡检管理》总菜单 + */ +var SSTS_EquipmentInspection_Menu = true; + + if (!notInWhiteList(sstsConfig, 'enableEquipmentInspectionManagementFunction')) { + SSTS_EquipmentInspection_Menu = false + } + + +/** + * 《ZSRY-60:设备巡检记录》菜单 + */ + var SSTS_EquipmentInspection_Query = true; + + if (!notInWhiteList(sstsConfig, 'enableEquipmentInspectionManagementFunction')) { + SSTS_EquipmentInspection_Query = false + } + + +/** + * 《ZSRY-60:设备巡检配置管理》菜单 + */ + var SSTS_EquipmentInspection_Config = true; + + if (!notInWhiteList(sstsConfig, 'enableEquipmentInspectionManagementFunction')) { + SSTS_EquipmentInspection_Config = false + } + + +/** * 《召回记录管理》菜单 */ var SSTS_RecallRecord_Menu = true; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r38039 -r38040 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 38039) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 38040) @@ -668,6 +668,22 @@ } ] },{ + text:"设备巡检管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_EquipmentInspection_Menu, + children:[ + {hidden :SSTS_EquipmentInspection_Query,text:"设备巡检记录",href:WWWROOT + '/disinfectsystem/equipmentInspection/forminstanceView.jsp',hrefTarget:linkTarget,leaf:true}, + { + text:"设备巡检定义管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_EquipmentInspection_Config, + children:[ + {hidden :false,text:"设备巡检定义",href:WWWROOT + '/disinfectsystem/equipmentInspection/formdefinitionView.jsp?listType=lastDefinition',hrefTarget:linkTarget,leaf:true}, + {hidden :false,text:"已部署设备巡检定义",href:WWWROOT + '/disinfectsystem/equipmentInspection/formdefinitionView.jsp?listType=deployed',hrefTarget:linkTarget,leaf:true} + ] + } + ] +},{ text:"设备耗材消耗管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_ConsumptiveMaterial,