Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r27068 -r27182 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27182) @@ -5,6 +5,7 @@ <%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%> <%@page import="java.util.Map"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> <%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%> <%@page import="com.forgon.disinfectsystem.common.Constants"%> @@ -363,7 +364,12 @@ var imageType_specification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>'; var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>'; var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; - +//包实例装配采集图片 +var tousseDefinitionImageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>'; +//视频类型(申请采集视频) +var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>'; +//视频类型(装配采集视频) +var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>'; var IMAGE_TYPE_MATERIAL_DETACHABLE = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>'; var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>'; var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>'; @@ -463,7 +469,7 @@ .script("${ctx}/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js") .script("${ctx}/dwr/interface/BarcodeTableManager.js") - .script("${ctx}/imageShow/imageShow.js") + .script("${ctx}/imageShow/imageShow.js") .script("${ctx}/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js")