部分数据调整

pages/inspection/inspFirst.vue

@@ -86,11 +86,11 @@ export default {
         },
         {
           text: "机房月度巡检",
-          value: "11",
+          value: "3",
         },
         {
           text: "机房年度巡检",
-          value: "12",
+          value: "4",
         },
       ],
       formData: {

pages/inspectionManagement/dialog.vue

@@ -154,22 +154,22 @@
 					});
 				// });
 			},
-			async copyPhotos() {
+			async copyPhotos() {
 				const signImgList = []
 				this.list.forEach((e) => {
 					if (typeof e.inspectionData === "string") {
 						e.inspectionData = JSON.parse(e.inspectionData) || "{}";
-					}
-					if(e.signImg) {
-						signImgList.push(e.signImg.split("/").pop())
-					}
+					}
+					if(e.signImg) {
+						signImgList.push(e.signImg.split("/").pop())
+					}
 				});
 				const urls = findPhotosUrls(this.list).map((url) => url.split("/").pop());
-				console.log("copy images", signImgList, urls);
-				await copySelectedFiles(
-					"_documents/data/sign",
-					`${SYNCHRONIZE_DATA_PAD}/发送数据`,
-					signImgList
+				console.log("copy images", signImgList, urls);
+				await copySelectedFiles(
+					"_documents/data/sign",
+					`${SYNCHRONIZE_DATA_PAD}/发送数据`,
+					signImgList
 				);
 				return copySelectedFiles(
 					"_documents/data/photos",
@@ -195,17 +195,29 @@
 					.map((item) => {
 						return item;
 					}); // 机房数据类型是 1
+				const YDXJ_DATA = notSynchronizationList
+					.filter((item) => item.inspectionType == 3)
+					.map((item) => {
+						return item;
+					}); // 月度巡检数据类型是 3
+				const NDXJ_DATA = notSynchronizationList
+					.filter((item) => item.inspectionType == 4)
+					.map((item) => {
+						return item;
+					}); // 年度巡检数据类型是 4
 
 				const JDXJ_DATA = notSynchronizationList
 					.filter((item) => item.inspectionType == 2)
 					.map((item) => {
 						return item;
 					}); // 井道数据类型是 2
-				console.log(5151, JFXJ_DATA, JDXJ_DATA);
-				const batchData = [...JFXJ_DATA, ...JDXJ_DATA]
-				let zipName = '巡检';
-				if(batchData.length === 1) {
-					zipName = batchData[0].inspectionType == 1 ? '机房巡检' : '井道巡检';
+				console.log(5151, JFXJ_DATA, JDXJ_DATA, YDXJ_DATA, NDXJ_DATA);
+				const batchData = [...JFXJ_DATA, ...JDXJ_DATA, ...YDXJ_DATA, ...NDXJ_DATA]
+				let zipName = '巡检';
+				if(batchData.length === 1) {
+					zipName = batchData[0].inspectionType == 1 ? '机房日常巡检' : 
+						batchData[0].inspectionType == 3 ? '机房月度巡检' 
+						:batchData[0].inspectionType == 4 ? '机房年度巡检' : '井道巡检';
 				}
 				this.loading = true;
 				const tmepList = [];
@@ -218,6 +230,13 @@
 						tmepList.push(this.packedData(JFXJ_DATA, JFXJ_DATA_FILE_NAME));
 					}
 
+					if (YDXJ_DATA.length) {
+						tmepList.push(this.packedData(YDXJ_DATA, `${userName}_YDXJ_${timeStr}.txt`));
+					}
+					if (NDXJ_DATA.length) {
+						tmepList.push(this.packedData(NDXJ_DATA, `${userName}_NDXJ_${timeStr}.txt`));
+					}
+
 					if (JDXJ_DATA.length) {
 						let JDXJ_DATA_FILE_NAME = `${userName}_JDXJ_${timeStr}.txt`;
 						tmepList.push(this.packedData(JDXJ_DATA, JDXJ_DATA_FILE_NAME));

utils/dict.js

@@ -1750,17 +1750,17 @@ export const tabsInfo1 = [
       "2、监控：有监控的机房需确保监控摄像头‌设备正常运作；监控摄像头外观无破损。",
     ],
   },
-  {
-    label: "冷通道系统",
-    value: "ltdxt",
-    status: 0,
-    text: [
-      "1、实际温度：查看冷通道内温度监测数据，确认温度维持在 18-27℃ 标准区间",
-      "2、实际湿度：检查相对湿度，确保数值在 40%-60% 范围内",
-      "3、天窗闭合：检查通道顶部天窗闭合状态",
-      "4、异常告警：检查显示屏有无历史告警或当前告警记录，如有异常及时记录并处理",
-    ],
-  },
+  // {
+  //   label: "冷通道系统",
+  //   value: "ltdxt",
+  //   status: 0,
+  //   text: [
+  //     "1、实际温度：查看冷通道内温度监测数据，确认温度维持在 18-27℃ 标准区间",
+  //     "2、实际湿度：检查相对湿度，确保数值在 40%-60% 范围内",
+  //     "3、天窗闭合：检查通道顶部天窗闭合状态",
+  //     "4、异常告警：检查显示屏有无历史告警或当前告警记录，如有异常及时记录并处理",
+  //   ],
+  // },
   {
     label: "屏蔽系统",
     value: "pbxt",
@@ -1771,14 +1771,14 @@ export const tabsInfo1 = [
       "3、滤波器运行：用手背轻触滤波器外壳，感知温度是否正常，无局部过热、烫手情况，听是否有异响",
     ],
   },
-  {
-    label: "除湿机",
-    value: "csj",
-    status: 0,
-    text: [
-      "1、温度、湿度显示：查看除湿机温湿度面板显示是否正常，温度与湿度和实际是否明显偏差",
-    ],
-  },
+  // {
+  //   label: "除湿机",
+  //   value: "csj",
+  //   status: 0,
+  //   text: [
+  //     "1、温度、湿度显示：查看除湿机温湿度面板显示是否正常，温度与湿度和实际是否明显偏差",
+  //   ],
+  // },
   {
     label: "设备告警",
     value: "sbgj",
@@ -1910,17 +1910,17 @@ export const tabsInfo2 = [
       "2、监控：有监控的机房需确保监控摄像头‌设备正常运作；监控摄像头外观无破损。",
     ],
   },
-  {
-    label: "冷通道系统",
-    value: "ltdxt",
-    status: 0,
-    text: [
-      "1、实际温度：查看冷通道内温度监测数据，确认温度维持在 18-27℃ 标准区间",
-      "2、实际湿度：检查相对湿度，确保数值在 40%-60% 范围内",
-      "3、天窗闭合：检查通道顶部天窗闭合状态",
-      "4、异常告警：检查显示屏有无历史告警或当前告警记录，如有异常及时记录并处理",
-    ],
-  },
+  // {
+  //   label: "冷通道系统",
+  //   value: "ltdxt",
+  //   status: 0,
+  //   text: [
+  //     "1、实际温度：查看冷通道内温度监测数据，确认温度维持在 18-27℃ 标准区间",
+  //     "2、实际湿度：检查相对湿度，确保数值在 40%-60% 范围内",
+  //     "3、天窗闭合：检查通道顶部天窗闭合状态",
+  //     "4、异常告警：检查显示屏有无历史告警或当前告警记录，如有异常及时记录并处理",
+  //   ],
+  // },
   {
     label: "屏蔽系统",
     value: "pbxt",
@@ -1931,14 +1931,14 @@ export const tabsInfo2 = [
       "3、滤波器运行：用手背轻触滤波器外壳，感知温度是否正常，无局部过热、烫手情况，听是否有异响",
     ],
   },
-  {
-    label: "除湿机",
-    value: "csj",
-    status: 0,
-    text: [
-      "1、温度、湿度显示：查看除湿机温湿度面板显示是否正常，温度与湿度和实际是否明显偏差",
-    ],
-  },
+  // {
+  //   label: "除湿机",
+  //   value: "csj",
+  //   status: 0,
+  //   text: [
+  //     "1、温度、湿度显示：查看除湿机温湿度面板显示是否正常，温度与湿度和实际是否明显偏差",
+  //   ],
+  // },
   {
     label: "电池状态",
     value: "dczt",