修复

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -97,7 +97,7 @@
 			return {
 				detailInfo: {},
 				control: '',
-				id: '',
+				site_id: '',
 				problem_one: [],
 				problem_two: [],
 			}
@@ -113,8 +113,9 @@
 				})
 			}
 			this.control = option.mark;
-
-			this.id = option.id;
+			
+			this.site_id=option.siteId;
+			// this.id = option.id;
 
 		},
 		methods: {
@@ -139,7 +140,8 @@
 				})
 				this.detailInfo = res.data.data[0];
 				this.problem_one = this.detailInfo.problem_one;
-				this.problem_two = this.detailInfo.problem_two
+				this.problem_two = this.detailInfo.problem_two;
+				this.id=res.data.data[0].id;
 				if (!this.detailInfo.account_number) {
 					uni.showToast({
 						title: "暂无档案信息!",

pages/videoList/videoList.vue

@@ -74,9 +74,12 @@
 				"companyCode": option.companyCode,
 				"deviceType": option.deviceType
 			})
+			var _this=this
+			setTimeout(function () {
+			 	_this.chk_video()
+			}, 100);
 
-
-			this.chk_video()
+		
 
 
 
@@ -110,7 +113,6 @@
 											// 	removeDIV('videomask');
 											// }
 											this.loadingStatus = false;
-
 											uni.navigateTo({
 												url: '/pages/videoDetail/videoDetail?deviceType=2&companyCode=' + this.companyCode + '&deviceCode=' +
 													this.onLineVideoList[n].DEVICE +
@@ -121,7 +123,6 @@
 											setTimeout(this.chk_video, 5000);
 										}
 									} else {
-
 										if (this.reCount > 7) {
 											// var mask = document.getElementById('videomask');
 											// if (mask != undefined) {
@@ -134,20 +135,15 @@
 												icon: "none"
 											});
 											// $("#myPopup").popup("open");
-
 											break;
-
-
 										}
-
 										setTimeout(this.chk_video, 5000);
 									}
-
-
-
 								}
 							}
 						} else {
+							// console.log(this.onLineVideoList)
+							// console.log(this.deviceData)
 							for (var i = 0; i < this.onLineVideoList.length; i++) {
 								for (var j = 0; j < this.deviceData.length; j++) {
 									if (this.onLineVideoList[i].DEVICE == this.deviceData[j].deviceCode) {
@@ -159,7 +155,8 @@
 									}
 								}
 							}
-							console.log(this.matchedDeviceList)
+							// console.log('this.matchedDeviceList.length')
+							// console.log(this.matchedDeviceList.length)
 						}
 
 					}
@@ -211,7 +208,9 @@
 					url: 'OperationMonitoring/getDeviceList',
 					data: ming
 				})
-				this.deviceData = res.data.data
+				this.deviceData = res.data.data;
+				// console.log('this.deviceData')
+				// console.log(this.deviceData)
 			},
 
 		}