Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_app

pages/deliveryInspection/form.vue

@@ -355,8 +355,25 @@
 		})
 	}
 	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+	
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 	function handleDrawingMenu(){

pages/factoryInspection/form.vue

@@ -297,9 +297,26 @@
 			upLoadImageHandler({ filePath: tempFilePaths[index],name:item.name})
 		})
 	}
-	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+function handleDeletedPhoto(e) {
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 	function handleDrawingMenu(){

pages/firstInspection/form.vue

@@ -356,9 +356,26 @@
 			upLoadImageHandler({ filePath: tempFilePaths[index],name:item.name})
 		})
 	}
-	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+function handleDeletedPhoto(e) {
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 	function handleDrawingMenu(){

pages/firstInspection/instrumentRoomForm.vue

@@ -328,9 +328,26 @@
 			upLoadImageHandler({ filePath: tempFilePaths[index],name:item.name})
 		})
 	}
-	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+function handleDeletedPhoto(e) {
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 	function handleDrawingMenu(){

pages/instrumentRoomInspection/form.vue

@@ -303,9 +303,26 @@
 			upLoadImageHandler({ filePath: tempFilePaths[index],name:item.name})
 		})
 	}
-	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+function handleDeletedPhoto(e) {
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 	function handleDrawingMenu(){

pages/onSiteInspection/form.vue

@@ -262,7 +262,11 @@
 							   url:data.fileName,
 							   pictureName:data.originalFilename
 						   })
-						   console.log(selectedPhotos.value)
+						   photoList.value.push({
+							   url:data.fileName,
+							   pictureName:data.originalFilename
+						   })
+						   console.log(photoList.value)
 						   })
 	}
 	function select (e) {
@@ -276,8 +280,25 @@
 		})
 	}
 	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}
 

pages/outsourcedInspection/form.vue

@@ -373,8 +373,25 @@ function upLoadImageHandler(arg) {
 		})
 	}
 	function handleDeletedPhoto(e) {
-		let fileName = selectedPhotos.value.map(info => info.name)
-			let index = fileName.findIndex(name => name === e.tempFile.name);
+		let fileName = selectedPhotos.value.map(info => info.pictureName)
+		const firstSlashIndex = e.tempFile.url.lastIndexOf('/');
+		const lastSlashIndex = e.tempFile.url.lastIndexOf('_');
+		const type = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex)
+		const pictureName = e.tempFile.url.substring(firstSlashIndex + 1,lastSlashIndex) +e.tempFile.url.substring(e.tempFile.url.lastIndexOf('.') -1 + 1);;
+			let index = -1; // 初始化 index 为 -1，表示未找到
+	
+			// 首先检查 e.tempFile.name 是否存在
+			if (fileName.findIndex(name => name === e.tempFile.name) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.name);
+			} 
+			// 如果 e.tempFile.name 不存在，检查 e.tempFile.pictureName 是否存在
+			else if (fileName.findIndex(name => name === e.tempFile.pictureName) !== -1) {
+				index = fileName.findIndex(name => name === e.tempFile.pictureName);
+			} 
+			// 如果以上两个都不存在，检查 pictureName 是否存在
+			else if (fileName.findIndex(name => name === pictureName) !== -1) {
+				index = fileName.findIndex(name => name === pictureName);
+			}
 			selectedPhotos.value.splice(index,1)
 	}