区分批量同步与单独同步

api/sqllite/init.js

@@ -102,6 +102,7 @@ export default {
 				      '_documents',
 				      '_documents/data',
 				      '_documents/data/asmzx',
+					  '_documents/data/photos',
 				      '_documents/data/asmzx/pad'
 				    ];
 				    

pages/inspectionManagement/dialog.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import {
+	import {
 		SYNCHRONIZE_DATA_PAD,
 		checkAndCreateDirectory,
 		createFileWithPlusIO,
@@ -46,24 +46,32 @@ import {
 		USER_FILE_NAME,
 		getUserList,
 		zipCompress,
-} from "@/utils/systemCofig";
-import { findPhotosUrls } from "@/utils/index.js";
-import { copySelectedFiles } from "@/utils/plus.js";
-
-import {
+	} from "@/utils/systemCofig";
+	import {
+		findPhotosUrls
+	} from "@/utils/index.js";
+	import {
+		copySelectedFiles
+	} from "@/utils/plus.js";
+
+	import {
 		writeInspectionData,
 		copyDirectory,
 		deleteAllFilesInDirectory,
 		addLog,
 		getLogContent,
 		LOG_TYPE_ENUM,
-} from "@/utils/IoReadingAndWriting.js";
-import moment from "moment";
-import { getAllInspections } from "@/request/index.js";
-import { Base64 } from "js-base64";
-import inspectApi from "@/api/inspect";
-import inspect from "@/api/inspect";
-export default {
+	} from "@/utils/IoReadingAndWriting.js";
+	import moment from "moment";
+	import {
+		getAllInspections
+	} from "@/request/index.js";
+	import {
+		Base64
+	} from "js-base64";
+	import inspectApi from "@/api/inspect";
+	import inspect from "@/api/inspect";
+	export default {
 		props: {
 			list: {
 				type: Array,
@@ -185,10 +193,13 @@ export default {
 						return item;
 					}); // 井道数据类型是 2
 				console.log(5151, JFXJ_DATA, JDXJ_DATA);
-
+				const batchData = [...JFXJ_DATA, ...JDXJ_DATA]
 				this.loading = true;
 				const tmepList = [];
-
+				if (notSynchronizationList.length > 1) {
+					let JFXJ_DATA_FILE_NAME = `${userName}_XJ_${timeStr}.txt`;
+					tmepList.push(this.packedData(batchData, JFXJ_DATA_FILE_NAME));
+				} else {
 					if (JFXJ_DATA.length) {
 						let JFXJ_DATA_FILE_NAME = `${userName}_JFXJ_${timeStr}.txt`;
 						tmepList.push(this.packedData(JFXJ_DATA, JFXJ_DATA_FILE_NAME));
@@ -198,6 +209,8 @@ export default {
 						let JDXJ_DATA_FILE_NAME = `${userName}_JDXJ_${timeStr}.txt`;
 						tmepList.push(this.packedData(JDXJ_DATA, JDXJ_DATA_FILE_NAME));
 					}
+				}
+
 
 				console.log("同步窗口");
 				console.log("同步窗口", tmepList);
@@ -221,7 +234,7 @@ export default {
 								userData[item.createByName] = [item];
 							}
 						});
-          this.$store.commit("SET_ALL_DATA", allList);
+						// this.$store.commit("SET_ALL_DATA", allList);
 
 						const keys = Object.keys(userData);
 						const promiseArr = keys.map((key) => {
@@ -242,7 +255,7 @@ export default {
 									await this.copyPhotos();
 									zipCompress(
 										`${SYNCHRONIZE_DATA_PAD}/发送数据`,
-                  `${SYNCHRONIZE_DATA_PAD}/fssj/${userName}_JFXJ_${timeStr}.zip`
+										`${SYNCHRONIZE_DATA_PAD}/fssj/${userName}_XJ_${timeStr}.zip`
 									);
 									// zip
 									await inspectApi.updateSyncData(ids);
@@ -338,10 +351,10 @@ export default {
 				});
 			},
 		},
-};
+	};
 </script>
 <style scoped lang="less">
-.synchronous-dialog {
+	.synchronous-dialog {
 		position: fixed;
 		z-index: 999;
 		top: 0;
@@ -358,13 +371,11 @@ export default {
 			width: 400px;
 			height: 60%;
 			box-sizing: border-box;
-    background-image: linear-gradient(
-      -6deg,
+			background-image: linear-gradient(-6deg,
 					#f9ffe7 0%,
 					#ffffff 12%,
 					#fcfeff 73%,
-      #ccf1ff 100%
-    );
+					#ccf1ff 100%);
 			border: 0.4px solid rgba(224, 224, 224, 1);
 			border-radius: 12px;
 			position: relative;
@@ -449,5 +460,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>
\ No newline at end of file