Index: ssts-web/src/main/webapp/buttjoint/imageFileCheck.jsp =================================================================== diff -u -r27950 -r28313 --- ssts-web/src/main/webapp/buttjoint/imageFileCheck.jsp (.../imageFileCheck.jsp) (revision 27950) +++ ssts-web/src/main/webapp/buttjoint/imageFileCheck.jsp (.../imageFileCheck.jsp) (revision 28313) @@ -18,15 +18,14 @@ $("#tab1").hide(); $("#tab2").hide(); $("#tab3").hide(); + $("#tab4").hide(); + $("#tab5").hide(); $.ajax({ url: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!checkImageFiles.do', type: "post", dataType: "json", success: function(result){ showData(result); - $("#tab1").show(); - $("#tab2").show(); - $("#tab3").show(); }, error: function(msg){ alert("ajax连接异常："+msg); @@ -44,37 +43,61 @@ var errorMaterialImage = result.data.errorMaterialImage; var errorOriginalImage = result.data.errorImage.errorOriginalImage; var errorThumbnailImage = result.data.errorImage.errorThumbnailImage; + var errorVideo = result.data.errorImage.errorVideo; + var errorUploadStatusTousse = result.data.errorUploadStatusTousse; + var errorUploadStatusMaterial = result.data.errorUploadStatusMaterial; var total = 0; - total = errorTousseImage.length + errorMaterialImage.length + errorOriginalImage.length + errorThumbnailImage.length; - $("#p0").html("包定义的图片健康检查结果：发现" + total + "个问题。"); - $("#p1").html("1、发现" + errorTousseImage.length + "个包定义有问题。问题类型：包定义记录有图片，文件夹内没有图片"); - $("#p2").html("2、发现" + errorMaterialImage.length + "个材料定义有问题。问题类型：材料定义记录有图片，文件夹内没有图片"); - $("#p3").html("3、发现" + (errorOriginalImage.length + errorThumbnailImage.length) + "个孤立的图片。问题类型：文件夹内图片，但没有对应的包定义或者材料定义"); + total = errorTousseImage.length + errorMaterialImage.length + errorOriginalImage.length + errorThumbnailImage.length + errorVideo.length + errorUploadStatusTousse.length + errorUploadStatusMaterial.length; + $("#p0").append("图片健康检查结果：

"); + $("#p0").append("共检查了" + result.data.tousseAmount + "个包定义，"); + $("#p0").append("共有" + result.data.tdImageSize + "个器械包图片，"); + $("#p0").append("" + result.data.specificationImageSize + "个说明书图片，"); + $("#p0").append("" + result.data.washGuideImageSize + "个清洗操作指引图片，"); + $("#p0").append("" + result.data.packTeachImageSize + "个装配教学图片，"); + $("#p0").append("" + result.data.packTeachVideoSize + "个配包教学视频文件。
"); + $("#p0").append("共检查了" + result.data.materialAmount + "个器械材料定义，"); + $("#p0").append("共有" + result.data.mdImageSize + "个材料图片，"); + $("#p0").append("" + result.data.washQuanlityCheckMethodImageSize + "个清洗质量检查关注点图片，"); + $("#p0").append("" + result.data.washQuanlityCheckPointImageSize + "个清洗质量检查方法图片，"); + $("#p0").append("" + result.data.functionCheckImageSize + "个功能检查图片。

"); + $("#p0").append("发现" + total + "个问题。"); + $("#p1").append("1、发现" + errorTousseImage.length + "个包定义有问题。问题类型：包定义记录有图片，文件夹内没有图片"); + $("#p2").append("2、发现" + errorMaterialImage.length + "个材料定义有问题。问题类型：材料定义记录有图片，文件夹内没有图片"); + $("#p3").append("3、发现" + (errorOriginalImage.length + errorThumbnailImage.length + errorVideo.length) + "个孤立的图片和视频。问题类型：文件夹内有图片和视频，但没有对应的包定义或者材料定义"); + $("#p4").append("4、发现" + errorUploadStatusTousse.length + "个包定义有问题。问题类型：已上传图片属性和数据库中的记录不一致"); + $("#p5").append("5、发现" + errorUploadStatusMaterial.length + "个器械材料定义有问题。问题类型：已上传图片属性和数据库中的记录不一致"); showTousseImage(errorTousseImage); showMaterialImage(errorMaterialImage); showErrorImage(result.data.errorImage); + showErrorUploadStatusTousse(errorUploadStatusTousse); + showErrorUploadStatusMaterial(errorUploadStatusMaterial); } } // 显示包定义图片 function showTousseImage(imageList){ var str = ""; + if(imageList.length <= 0){ + return; + } + $("#tab1").show(); var th = "序号包定义id包定义名称图片类型原图/缩略图图片名称文件上传时间" $("#tab1").append(th); for(var i=0;i" + (j + 1) + "" + "" + tousseDefinitionID + "" + tousseDefinitionName + "" + "" + imageType + "" + "原图" + "" + UUIDImageName + "" + "" + uploadDateTime + "" + ""; + var str = "" +"" + (i + 1) + "" + "" + tousseDefinitionID + "" + tousseDefinitionName + "" + "" + imageType + "" + "原图" + "" + UUIDImageName + "" + "" + uploadDateTime + "" + ""; $("#tab1").append(str); }else{ var str = "" + "" + imageType + "" + "原图" + "" + UUIDImageName + "" + "" + uploadDateTime + "" + ""; @@ -87,19 +110,35 @@ var uploadDateTime = thumbnailImage.uploadDateTime; var imageType = thumbnailImage.imageType; if(originalImageArray.length == 0 && j == 0){ - var str = "" +"" + (j + 1) + "" + "" + tousseDefinitionID + "" + tousseDefinitionName + "" + "" + imageType + "" + "缩略图" + "" + UUIDAndImageName + "" + "" + uploadDateTime + "" + ""; + var str = "" +"" + (i + 1) + "" + "" + tousseDefinitionID + "" + tousseDefinitionName + "" + "" + imageType + "" + "缩略图" + "" + UUIDAndImageName + "" + "" + uploadDateTime + "" + ""; $("#tab1").append(str); }else{ var str = "" + "" + imageType + "" + "缩略图" + "" + UUIDAndImageName + "" + "" + uploadDateTime + "" + ""; $("#tab1").append(str); } - } + for(var j=0;j" + (i + 1) + "" + "" + tousseDefinitionID + "" + tousseDefinitionName + "" + "" + videoType + "" + "原图" + "" + UUIDAndVideoName + "" + "" + uploadDateTime + "" + ""; + $("#tab1").append(str); + } else{ + var str = "" + "" + videoType + "" + "原图" + "" + UUIDAndVideoName + "" + "" + uploadDateTime + "" + ""; + $("#tab1").append(str); + } + } } } // 显示材料定义图片 function showMaterialImage(imageList){ + if(imageList.length <= 0){ + return; + } + $("#tab2").show(); var th = "序号材料定义id材料定义名称图片类型原图/缩略图图片名称文件上传时间" $("#tab2").append(th); var str = ""; @@ -116,7 +155,7 @@ var originalImageTime = originalImage.uploadDateTime; var originalImageType = originalImage.imageType; if(j==0){ - str = "" + "" + (j + 1) + "" + "" + materialDefinitionId + "" + materialDefinitionIdName + "" + + str = "" + "" + (i + 1) + "" + "" + materialDefinitionId + "" + materialDefinitionIdName + "" + "" + originalImageType + "" + "原图" + "" + originalImageName + "" + "" + originalImageTime + "" + ""; $("#tab2").append(str); } else { @@ -143,26 +182,80 @@ // 显示孤立图片 function showErrorImage(errorImage){ - var th = "序号原图/缩略图图片名称文件上传时间"; - $("#tab3").append(th); var errorOriginalImage = errorImage.errorOriginalImage; var errorThumbnailImage = errorImage.errorThumbnailImage; + var errorVideo = errorImage.errorVideo; + if(errorOriginalImage.length <= 0 && errorThumbnailImage.length <= 0 && errorVideo.length <= 0){ + return; + } + $("#tab3").show(); + var th = "序号原图/缩略图图片名称文件上传时间"; + $("#tab3").append(th); + var row = 1; for(var i=0;i" + (i+1) + "" + "原图" + "" + originalImageName + "" + "" + originalImageTime + "" + ""; + str = ""+ "" + (row++) + "" + "原图" + "" + originalImageName + "" + "" + originalImageTime + "" + ""; $("#tab3").append(str); } for(var i=0;i" + (i+errorOriginalImage.length+1) + "" + "缩略图" + "" + thumbnailImageName + "" + "" + thumbnailImageTime + "" + ""; + str = ""+ "" + (row++) + "" + "缩略图" + "" + thumbnailImageName + "" + "" + thumbnailImageTime + "" + ""; $("#tab3").append(str); } + for(var i=0;i" + (row++) + "" + "视频" + "" + videoName + "" + "" + lastModifyTime + "" + ""; + $("#tab3").append(str); + } } + + // 包定义已上传图片属性和数据库中的记录不一致 + function showErrorUploadStatusTousse(errorUploadStatusTousse){ + if(errorUploadStatusTousse.length <= 0){ + return; + } + $("#tab4").show(); + var th = "序号包定义id包定义名称已上传图片属性数据库中是否有图片记录"; + $("#tab4").append(th); + for(var i=0;i" + (i+1) + "" + "" + id + "" + "" + name + "" + "" + isUploadImage + "" + "" + isExistImage + ""+ ""; + $("#tab4").append(str); + } + } + + // 器械材料定义 已上传图片属性和数据库中的记录不一致 + function showErrorUploadStatusMaterial(errorUploadStatusMaterial){ + if(errorUploadStatusMaterial.length <= 0){ + return; + } + $("#tab5").show(); + var th = "序号器械定义id器械定义名称规格已上传图片属性数据库中是否有图片记录"; + $("#tab5").append(th); + for(var i=0;i" + (i+1) + "" + "" + id + "" + "" + name + "" + "" + specification + ""+ "" + isUploadImage + "" + "" + isExistImage + ""+ ""; + $("#tab5").append(str); + } + } @@ -186,5 +279,13 @@ 序号原图/缩略图图片名称文件日期 --> +

+ + +
+

+ + +