数据对接联调

pages/deviceAdd/deviceAdd.vue

@@ -156,7 +156,6 @@
 				uni.setNavigationBarTitle({
 					title: '设备新增'
 				});
-
 			}
 
 

pages/eleControl/powerCut/calendar/calendar.vue

@@ -76,7 +76,6 @@
 			// 选择日期
 			bindDateChange: function(e) {
 				this.start_date = e.target.value
-
 			},
 			bindDateChange2: function(e) {
 				this.end_date = e.target.value;

pages/eleControl/powerCut/powerCut.vue

@@ -117,7 +117,6 @@
 </template>
 
 <script>
-	import json from '../../../data/json.js';
 	export default {
 		data() {
 			return {
@@ -126,9 +125,6 @@
 				listTouchStart: 0,
 				listTouchDirection: null,
 
-				unporcessList: json.inspectUnprocessList,
-				porcessedList: json.inspectProcessedList,
-
 				type: '0',
 
 				CustomBar: this.CustomBar,
@@ -148,6 +144,15 @@
 		},
 		
 		methods: {
+			
+			//编辑
+			editItem(item) {
+				uni.navigateTo({
+					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd?id=' + item.id + '&status_value=' + this.status_value + '',
+				});
+			},
+			
+			
 			//筛选
 			searchSiteList() {
 				this.getDataList({
@@ -156,6 +161,48 @@
 				})
 			},
 			
+			//删除
+			deleteItem(item) {
+				uni.showModal({
+					title: '确认删除吗？',
+					content: '',
+					success: function(result) {
+						if (result.confirm) {
+							this.setDelSite({
+								"id": item.id
+							})
+						} else if (result.cancel) {
+							// console.log('用户点击取消');
+						}
+					}.bind(this)
+				});
+			},
+			async setDelSite(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'BlackoutPlan/delBlackoutPlan',
+					data: ming
+				})
+				if (!res.data.flag) {
+					uni.showToast({
+						title: "删除失败",
+						icon: "none"
+					});
+				}else{
+					uni.showToast({
+						title: "删除成功",
+					});
+					setTimeout(() => {
+						this.getDataList({
+							"site_name": this.site_name,
+							"status_value":this.status_value
+						})
+					}, 1000);
+				}
+				
+			},
+			
+			
+			
 			//数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({

pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -1,24 +1,13 @@
 <template>
 	<view class="appWrapper">
-		<form action="">
+		<form action="" v-if="!id">
 			<view style="height:30rpx"></view>
 			<calendar  :bindStartTime="formMess.start_time" :bindEndTime="formMess.end_time"></calendar>
-			<!-- <view class="form-item">
-				<view class="title">
-					<text class="necessary">*</text>
-					开始时间:
-				</view>
-				<input name="input" v-model="formMess.deviceNo"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">结束时间:</view>
-				<input name="input" v-model="formMess.deviceName"></input>
-			</view> -->
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属站点:</view>
 				<select name="" id="" filterable clearable v-model="formMess.site_id">
-					<option value="">请选择</option>
-					<option :value=item.supervision_name v-for="item in siteListData">{{ item.site_name}}</option>
+					<option value="0">请选择</option>
+					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
 				</select>
 			</view>
 			
@@ -26,33 +15,57 @@
 				<view class="title"><text class="necessary">*</text>计划类型:</view>
 				
 				<select name="" id="" filterable clearable v-model="formMess.plan_type">
-					<option value="">请选择</option>
+					<option value="0">请选择</option>
 					<option value="1">计划检修停电</option>
 					<option value="2">计划施工停电</option>
 					<option value="3">客户申请停电</option>
 				</select>
 			</view>
+			<view class="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top" @click="addSubmit()">提 交 </button>
+			</view>
+		</form>
+		
+		<!-- 修改start -->
+		<form action="" v-else>
+			<view style="height:30rpx"></view>
+			<calendar  :bindStartTime="planDetailData.start_time" :bindEndTime="planDetailData.end_time" v-if="this.planDetailData.end_time" ></calendar>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>所属站点:</view>
+				<select name="" id="" filterable clearable v-model="planDetailData.site_id" disabled="disabled">
+					<option value="0">请选择</option>
+					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+				</select>
+			</view>
 			
-		<!-- 	<view class="form-item">
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>计划类型:</view>
+				<select name="" id="" filterable clearable v-model="planDetailData.plan_type" disabled="disabled">
+					<option value="0">请选择</option>
+					<option value="1">计划检修停电</option>
+					<option value="2">计划施工停电</option>
+					<option value="3">客户申请停电</option>
+				</select>
+			</view>
+			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					报备人:
 				</view>
-				<input name="input" v-model="formMess.deviceNo" placeholder="张三"></input>
+				<input name="deviceCode" v-model="planDetailData.creator" disabled="disabled"></input>
 			</view>
-			
-			<view class="form-item">
+			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					手机号:
 				</view>
-				<input name="input" v-model="formMess.deviceNo" placeholder="18888888888"></input>
-			</view> -->
-
+				<input name="deviceCode" v-model="planDetailData.phone" disabled="disabled"></input>
+			</view>
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="editSubmit()">提 交 </button>
 			</view>
 		</form>
+		<!-- 修改end -->
 
 
 	</view>
@@ -66,22 +79,153 @@
 
 		data() {
 			return {
+				id:'',
 				isShow: false,
 				formMess: {
-					"site_id": "",
-					"plan_type": "",
-					"start_time": "2021-07-06 16:05:48",
-					"end_time": "2021-07-06 18:05:48",
+					"site_id": 0,
+					"plan_type": 0,
+					"start_time": "",
+					"end_time": "",
+					// "start_time": "2021-7-12 18:05:48",
+					// "end_time": "2021-7-12 18:05:48",
 				},
 				siteListData:[],
-				planTypeData:[]
+				planTypeData:[],
+				planDetailData:{}
 			}
 		},
 		onLoad: function(option) {
 			this.getSiteList();
+			this.id=option.id;
+			this.status_value=option.status_value
+			if (option.id) {
+				uni.setNavigationBarTitle({
+					title: '计划停电修改'
+				});
+				this.getDataList({
+					"id": option.id,
+					"status_value": option.status_value
+				})
+			} else {
+				uni.setNavigationBarTitle({
+					title: '计划停电新增'
+				});
+			}
 			
 		},
 		methods: {
+			//新增验证并提交
+			addSubmit() {
+				alert( this.formMess.start_time)
+				if (!this.formMess.start_time) {
+					uni.showToast({
+						title: "请选择开始时间",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.formMess.end_time) {
+					uni.showToast({
+						title: "请选择结束时间",
+						icon: "none"
+					});
+					return
+				}
+				
+				if (!this.formMess.site_id) {
+					uni.showToast({
+						title: "请选择所属站点",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.formMess.plan_type) {
+					uni.showToast({
+						title: "请选择计划类型",
+						icon: "none"
+					});
+					return
+				}
+				
+				this.setAddDevice({
+					"site_id": this.formMess.site_id,
+					"plan_type": this.formMess.plan_type,
+					"start_time": this.formMess.start_time,
+					"end_time": this.formMess.end_time,
+				})
+			},
+			// 新增请求
+			async setAddDevice(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'BlackoutPlan/addBlackoutPlan',
+					data: ming
+				})
+				if (!res.data.flag) {
+					uni.showToast({
+						title: "添加失败",
+						icon: "none"
+					});
+				} else {
+					uni.showToast({
+						title: "添加成功",
+					});
+				}
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/eleControl/powerCut/powerCut'
+					});
+				}, 1000);
+			},
+			
+			// 修改回显请求
+			async getDataList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'BlackoutPlan/getBlackoutPlanList',
+					showLoading: true,
+					data: params
+				})
+				console.log('res.data.data')
+				console.log(res.data.data)
+				this.planDetailData = res.data.data[0],
+				this.start_time=this.planDetailData.start_time
+				console.log(this.planDetailData.start_time)
+			},
+			
+			//编辑验证并提交
+			editSubmit() {
+				this.updataPlan({
+					"site_id": this.planDetailData.site_id,
+					"plan_type": this.planDetailData.plan_type,
+					"start_time": this.planDetailData.start_time,
+					"end_time": this.planDetailData.end_time,
+					"creator": this.planDetailData.creator,
+					"phone": this.planDetailData.phone,
+					"id":this.planDetailData.id,
+				})
+			},
+			// 编辑请求
+			async updataPlan(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'BlackoutPlan/updateBlackoutPlan',
+					data: ming
+				})
+				if (!res.data.flag) {
+					uni.showToast({
+						title: "编辑失败",
+						icon: "none"
+					});
+				} else {
+					uni.showToast({
+						title: "编辑成功",
+					});
+				}
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/siteManage/siteManage',
+					});
+				}, 1000);
+			},
+			
 			//站带下拉数据请求
 			async getSiteList(params = {}) {
 				const res = await this.$myRequest({
@@ -90,78 +234,12 @@
 					data: params
 				})
 				this.siteListData = res.data.data
-				// console.log(this.siteListData)
-			},
-			
-			submit() {
-				uni.navigateTo({
-					url: '/pages/accountManage/success/success',
-				});
 			},
 		}
 	}
 </script>
 
 <style lang="scss">
-	.cu-form-group {
-		border-top: 0;
-	}
-	input,
-	select,
-	option {
-		line-height: 70rpx;
-		padding: 0 20rpx;
-		height: 70rpx;
-		border: 1px solid #EDEDED;
-		// width:500rpx!important;
-		background-color: #fff;
-		box-sizing: border-box;
-		appearance: none;
-		-moz-appearance: none;
-		-webkit-appearance: none;
-		color: #999;
-
-
-	}
-
-	select:focus,
-	select:active,
-	select:hover {
-		outline: none;
-	}
-
-	select {
-		background: url(../../../../static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		margin-bottom: 20rpx;
-
-
-		.title {
-			width: 170rpx;
-			position: relative;
-
-			.necessary {
-				color: red;
-				display: inline-block;
-				position: absolute;
-				top: -2rpx;
-				left: -20rpx;
-				font-size: 40rpx;
-
-			}
-		}
-
-		input,
-		select {
-			width: 500rpx;
-			font-size: 28rpx;
-		}
-	}
+	
 
 </style>

pages/eleControl/powerCut/powerCutDetail/powerCutDetail.vue

@@ -71,65 +71,6 @@
 </script>
 
 <style lang="scss">
-	.cu-form-group {
-		border-top: 0;
-	}
-	input,
-	select,
-	option {
-		line-height: 70rpx;
-		padding: 0 20rpx;
-		height: 70rpx;
-		border: 1px solid #EDEDED;
-		// width:500rpx!important;
-		background-color: #fff;
-		box-sizing: border-box;
-		appearance: none;
-		-moz-appearance: none;
-		-webkit-appearance: none;
-		color: #999;
-
-
-	}
-
-	select:focus,
-	select:active,
-	select:hover {
-		outline: none;
-	}
-
-	select {
-		background: url(../../../../static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		margin-bottom: 20rpx;
-
-
-		.title {
-			width: 170rpx;
-			position: relative;
-
-			.necessary {
-				color: red;
-				display: inline-block;
-				position: absolute;
-				top: -2rpx;
-				left: -20rpx;
-				font-size: 40rpx;
-
-			}
-		}
-
-		input,
-		select {
-			width: 500rpx;
-			font-size: 28rpx;
-		}
-	}
+	
 
 </style>

pages/index/index.vue

@@ -246,7 +246,6 @@
 								uni.switchTab({
 									url: '/pages/index/index'
 								});
-								// window.location.href = 'http://124.71.174.104:8081/index.html#/';
 							}
 						}
 					});

pages/processedDetail/processedDetail.vue

@@ -256,7 +256,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/processedDetail1/processedDetail1.vue

@@ -259,7 +259,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/siteAdd/siteAdd.vue

@@ -39,18 +39,27 @@
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属线路:</view>
-				<select name="" id="">
-					<option value="">线路一</option>
-					<option value="">线路二</option>
+				<select name="" id="" filterable clearable v-model="router_id">
+					<option value="0">请选择</option>
+					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
 				</select>
 			</view>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>所属线区域:</view>
+				<select name="" id="" v-model="region">
+					<option value="0">请选择</option>
+					<option value="1">宝山</option>
+					<option value="2">嘉定</option>
+				</select>
+			</view>
+			
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>装机容量:</view>
-				<input name="input" ></input>
+				<input name="input" v-model="installed_capacity"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变化:</view>
-				<input name="input" ></input>
+				<input name="input" v-model="rheological_change"></input>
 			</view>
 			
 
@@ -96,24 +105,30 @@
 				<view class="title">手机号码:</view>
 				<input name="input" v-model="siteMessage.phone"></input>
 			</view>
-			
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>所属线区域:</view>
+				<select name="" id="" v-model="siteMessage.region">
+					<option value="0">请选择</option>
+					<option value="1">宝山</option>
+					<option value="2">嘉定</option>
+				</select>
+			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属线路:</view>
-				<select name="" id="">
-					<option value="">线路一</option>
-					<option value="">线路二</option>
+				<select name="" id=" " v-model="siteMessage.route_id">
+					<option value="0">请选择</option>
+					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
 				</select>
+
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>装机容量:</view>
-				<input name="input" ></input>
+				<input name="input" v-model="siteMessage.installed_capacity"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变化:</view>
-				<input name="input" ></input>
+				<input name="input" v-model="siteMessage.rheological_change"></input>
 			</view>
-		
-		
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="editSubmit">提 交 </button>
 			</view>
@@ -137,7 +152,13 @@
 				phone: "",
 				address: "",
 				longitude: "",
-				siteMessage:{}
+				siteMessage:{},
+				
+				region:0,
+				router_id:0,
+				routeListData:[],
+				installed_capacity:'',
+				rheological_change:''
 			}
 		},
 		
@@ -152,11 +173,24 @@
 				uni.setNavigationBarTitle({
 					title: '站点新增'
 				});
-			}
+			}
+			
+			this.getRoutrBox()
 			 
 		},
 
-		methods: {
+		methods: {
+			
+			//线路名称下拉数据请求
+			async getRoutrBox(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Archives/getRoutrBox',
+					showLoading: true,
+					data: params
+				})
+				this.routeListData = res.data.data;
+				console.log(this.routeListData)
+			},
 			//新增
 			getLocation(){
 				// 将this赋值给that
@@ -233,7 +267,8 @@
 						icon: "none"
 					});
 					return
-				}
+				}
+				
 				if (!/^1[3456789]\d{9}$/.test(this.phone)){
 					uni.showToast({
 						title: "请输入正确的手机号码...",
@@ -241,13 +276,39 @@
 					});
 					return
 				 }
+				 
+				 if (!this.router_id) {
+				 	uni.showToast({
+				 		title: "请选择所属线路...",
+				 		icon: "none"
+				 	});
+				 	return
+				 }
+				 if (!this.installed_capacity) {
+				 	uni.showToast({
+				 		title: "请输入装机容量...",
+				 		icon: "none"
+				 	});
+				 	return
+				 }
+				 if (!this.rheological_change) {
+				 	uni.showToast({
+				 		title: "请输入流变变化...",
+				 		icon: "none"
+				 	});
+				 	return
+				 }
 				this.getAddSite({
 					"siteName": this.siteName,
 					"userName": this.userName,
 					"phone": this.phone,
 					"address": this.address,
 					"longitude": this.longitude,
-					"latitude": this.latitude
+					"latitude": this.latitude,
+					"route_id":this.router_id,
+					"region":this.region,
+					"installed_capacity":this.installed_capacity,
+					"rheological_change":this.rheological_change
 				})
 			},
 			
@@ -301,6 +362,27 @@
 						icon:"none"
 					});
 					return
+				 }
+				 if (!this.siteMessage.route_id) {
+				 	uni.showToast({
+				 		title: "请选择所属线路...",
+				 		icon: "none"
+				 	});
+				 	return
+				 }
+				 if (!this.siteMessage.installed_capacity) {
+				 	uni.showToast({
+				 		title: "请输入装机容量...",
+				 		icon: "none"
+				 	});
+				 	return
+				 }
+				 if (!this.siteMessage.rheological_change) {
+				 	uni.showToast({
+				 		title: "请输入流变变化...",
+				 		icon: "none"
+				 	});
+				 	return
 				 }
 				this.setEditSite({
 					"id":this.id,
@@ -309,7 +391,11 @@
 					"phone": this.siteMessage.phone,
 					"address": this.siteMessage.address,
 					"longitude": this.siteMessage.longitude,
-					"latitude": this.siteMessage.latitude
+					"latitude": this.siteMessage.latitude,
+					"route_id":this.siteMessage.route_id,
+					"region":this.siteMessage.region,
+					"installed_capacity":this.siteMessage.installed_capacity,
+					"rheological_change":this.siteMessage.rheological_change
 				})
 			},
 			

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -24,7 +24,7 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>站点名称:</view>
 				<select name="" id="" v-model="formMess.site_id" filterable clearable>
-					<!-- <option value="0">请选择</option> -->
+					<option value="0">请选择</option>
 					<option :value="item.id"  v-for="item in siteListData">{{ item.site_name}}</option>
 				</select>
 			</view>
@@ -39,7 +39,7 @@
 			</view>
 			<view class="form-item extraDis">
 				<view class="title"><text class="necessary">*</text>电缆孔洞:</view>
-				<radio-group name="formMess.cable_hole" @change="radioChange">
+				<radio-group name="formMess.cable_hole"  v-model="formMess.cable_hole">
 					<label class="margin-right-xl">
 						<radio value="1"/><text>是</text>
 					</label>
@@ -50,7 +50,7 @@
 			</view>
 			<view class="form-item extraDis">
 				<view class="title"><text class="necessary">*</text>门窗、墙壁破损:</view>
-				<radio-group name="formMess.damage" @change="radioChange">
+				<radio-group name="formMess.damage" @change="radioChange" >
 					<label class="margin-right-xl">
 						<radio value="1"/><text>是</text>
 					</label>
@@ -278,10 +278,10 @@
 					"rheological_change": "",
 					"power_capacity": "",
 					"route_id": "",
-					"site_id": "",
+					"site_id": 0,
 					"supervision_department_id": "",
 					
-					"cable_hole": "",
+					"cable_hole": "0",
 					"damage": "",
 					"water_leakage": "",
 					"annihilator_insufficient_configuration": "",
@@ -313,6 +313,8 @@
 		},
 		onLoad: function(option) {
 			this.getDataList()
+			console.log('this.formMess.cable_hole')
+		console.log(this.formMess.cable_hole)
 
 		},
 		methods: {
@@ -388,10 +390,10 @@
 					"route_id": this.formMess.route_id,
 					"site_id": this.formMess.site_id,
 					"supervision_department_id": this.formMess.supervision_department_id,
-					"cable_hole":this.radioOne,
-					"damage":this.radioOne,
-					"water_leakage":this.radioOne,
-					"annihilator_insufficient_configuration":this.radioOne,
+					"cable_hole":this.formMess.cable_hole,
+					// "damage":this.radioOne,
+					// "water_leakage":this.radioOne,
+					// "annihilator_insufficient_configuration":this.radioOne,
 					
 					
 					"old_equipment": this.formMess.old_equipment,

pages/siteManage/siteManage.vue

@@ -5,12 +5,16 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white">
-					<select name="" id="" style="width:100%">
+					<!-- <select name="" id="" style="width:100%">
 						<option value="">线路名称1</option>
 						<option value="">线路名称2</option>
 						<option value="">线路名称3</option>
+					</select> -->
+					
+					<select name="" id="" filterable clearable v-model="router_id">
+						<option value="0">请选择线路名称</option>
+						<option :value=item.route_name v-for="item in routeListData">{{ item.route_name}}</option>
 					</select>
-					<!-- <input class="" type="text" placeholder="监察" confirm-type="search" v-model="siteName"></input> -->
 				</view>
 
 			</view>
@@ -78,7 +82,10 @@
 
 				siteName: '',
 				siteList: [],
-				siteListRes: 0
+				siteListRes: 0,
+				
+				router_id:0,
+				routeListData:[]
 
 			};
 		},
@@ -87,14 +94,28 @@
 
 			//站点列表渲染
 			this.getSiteList()
+			this.getRoutrBox()
 
 		},
 
 		methods: {
+			
+			//线路名称下拉数据请求
+			async getRoutrBox(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Archives/getRoutrBox',
+					showLoading: true,
+					data: params
+				})
+				this.routeListData = res.data.data;
+				console.log(this.routeListData)
+			},
+			
 			//筛选
 			searchSiteList() {
 				this.getSiteList({
-					"siteName": this.siteName
+					"siteName": this.siteName,
+					"route_name":this.router_id
 				})
 			},
 

pages/unprocessDetail/unprocessDetail.vue

@@ -359,7 +359,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/unprocessDetail1/unprocessDetail1.vue

@@ -361,7 +361,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/videoList/videoList.vue

@@ -115,7 +115,6 @@
 												url: '/pages/videoDetail/videoDetail?deviceType=2&companyCode=' + this.companyCode + '&deviceCode=' +
 													this.onLineVideoList[n].DEVICE +
 													'',
-												// url:'http://124.71.174.104:8081/video.html?device='+this.onLineVideoList[n].DEVICE+'&companyid=' + this.companyCode + ''
 											});
 
 										} else {
@@ -176,7 +175,6 @@
 							uni.navigateTo({
 								url: '/pages/videoDetail/videoDetail?deviceType=2&companyCode=' + this.companyCode + '&deviceCode=' + item.DEVICE +
 									'',
-								// url:'http://124.71.174.104:8081/video.html?device='+item.DEVICE+'&companyid=' + this.companyCode + ''
 							});
 							return;
 						}