From 75a390cb9ed6de55d4282122271fd28f8fef8457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Sun, 31 Jul 2022 23:01:08 +0800
Subject: [PATCH] up

---
 order/order/order/order.vue                   |  223 +--
 .../pages/generalPatrol/generalPatrol.vue     |   21 +-
 .../pages/dailyInspection/dailyInspection.vue |  195 +--
 .../raininspection/raininspection.vue         | 1453 +++++++++--------
 rainmaintain/rainmaintain/rainmaintain.vue    | 1052 ++++++------
 road/road/road.vue                            |   28 +-
 utils/util.js                                 |    2 +-
 7 files changed, 1530 insertions(+), 1444 deletions(-)

diff --git a/order/order/order/order.vue b/order/order/order/order.vue
index cf69a84..8136980 100644
--- a/order/order/order/order.vue
+++ b/order/order/order/order.vue
@@ -4,15 +4,15 @@
 			<u-form-item label="反馈科室" label-position="top" prop="type">
 				<u-input placeholder="请选择反馈科室" v-model="depName" type="select" :border="true" @click="depshow = true" />
 				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-				<u-select v-model="depshow" mode="single-column" value-name="id" label-name="name" :list="rainArr.depList"
-					@confirm="confirmDepType"></u-select>
+				<u-select v-model="depshow" mode="single-column" value-name="id" label-name="name"
+					:list="rainArr.depList" @confirm="confirmDepType"></u-select>
 			</u-form-item>
 			<u-form-item label="工单标题" label-position="top" prop="name" required>
-				<u-input v-model="form.name" type="text" :border="true" placeholder="请填写标题"/>
+				<u-input v-model="form.name" type="text" :border="true" placeholder="请填写标题" />
 			</u-form-item>
 			<u-form-item label="地址" label-position="top" required>
 				<!-- <text>{{form.address}}</text> -->
-				<u-input v-model="form.address" disabled type='text'/>
+				<u-input v-model="form.address" disabled type='text' />
 				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
 			</u-form-item>
 			<u-form-item label-position="top" label="内容" prop="content" required>
@@ -20,44 +20,42 @@
 			</u-form-item>
 			<u-form-item label-position="top" label="现场照片">
 				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
+					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList"
+					:form-data="otherData" :show-tips="false"
+					@on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
 					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
 				</u-upload>
 			</u-form-item>
 			<u-form-item label-position="top" label="异常处置建议" prop="tip">
 				<u-input v-model="form.tip" placeholder="请填写异常处置建议" type='textarea' height='100' :border="true" />
 			</u-form-item>
-			
+
 			<u-form-item labelWidth="240" label-position="left" label="是否隶属于雨管科">
 				<u-radio-group v-model="form.is_rain">
-					<u-radio 
-						v-for="(item, index) in rainArr.rains" :key="index" 
-						:name="item.id"
-					>
+					<u-radio v-for="(item, index) in rainArr.rains" :key="index" :name="item.id">
 						{{item.name}}
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>
 			<u-form-item labelWidth="240" label-position="left" label="是否现场处理">
 				<u-radio-group v-model="form.is_scene" @change="radioGroupChange">
-					<u-radio 
-						v-for="(item, index) in rainArr.scenes" :key="index" 
-						:name="item.id"
-					>
+					<u-radio v-for="(item, index) in rainArr.scenes" :key="index" :name="item.id">
 						{{item.name}}
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>
-			
+
 
 			<div v-if="form.is_scene==1">
 				<u-form-item label-position="top" label="现场处理结果" prop="result">
 					<u-input v-model="form.result" type='textarea' height='100' :border="true" />
 				</u-form-item>
-				
+
 				<u-form-item label-position="top" label="处理后照片">
 					<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="dealFilesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
+						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess"
+						:file-list="dealFilesList" :form-data="otherData" :show-tips="false"
+						@on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
 						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
 					</u-upload>
 				</u-form-item>
@@ -75,44 +73,44 @@
 				otherData: {
 					token: ""
 				},
-				depshow:false,
-				depName:"",
-				rainArr:{
-					depList:[],
-					rains:[{
-						id:0,
-						name:"否"
-					},{
-						id:1,
-						name:"是"
+				depshow: false,
+				depName: "",
+				rainArr: {
+					depList: [],
+					rains: [{
+						id: 0,
+						name: "否"
+					}, {
+						id: 1,
+						name: "是"
 					}],
-					scenes:[{
-						id:0,
-						name:"否"
-					},{
-						id:1,
-						name:"是"
+					scenes: [{
+						id: 0,
+						name: "否"
+					}, {
+						id: 1,
+						name: "是"
 					}]
 				},
 				action: "",
-				infoId:"",
-				
-				filesList:[],
-				dealFilesList:[],
-				changeResult:"",
-				changedealFilesList:[],
+				infoId: "",
+
+				filesList: [],
+				dealFilesList: [],
+				changeResult: "",
+				changedealFilesList: [],
 				form: {
-					feedback_department_id:"",
-					name:"",
-					content:"",
-					status:0,
-					is_rain:"",
-					is_scene:"",
-					tip:"",
-					result:"",
-					address:"",
-					files_list:"",
-					files_end_list:""
+					feedback_department_id: "",
+					name: "",
+					content: "",
+					status: 0,
+					is_rain: "",
+					is_scene: "",
+					tip: "",
+					result: "",
+					address: "",
+					files_list: "",
+					files_end_list: ""
 				},
 				width: 300,
 				height: 300,
@@ -134,12 +132,12 @@
 		},
 		onLoad(options) {
 			var that = this;
-			if(options.id){
+			if (options.id) {
 				this.infoId = options.id;
 				this.showInfo(this.infoId);
 			}
 			this.loadDep();
-			
+
 			this.action = this.util.HOST + "/api/mobile/upload-file";
 			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
 		},
@@ -148,17 +146,34 @@
 			let that = this;
 			uni.getLocation({
 				type: "gcj02",
-				geocode:true,
+				geocode: true,
 				success(res) {
 
-					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
+						loc = window.android.getLocInfo();
+					}
+					let latitude = "";
+					let longitude = "";
+					if (loc) {
+						latitude = JSON.parse(loc).lat;
+						longitude = JSON.parse(loc).lon;
+					} else {
+						latitude = res.latitude;
+						longitude = res.longitude;
+					}
+
+					const url =
+						"https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location=" +
+						latitude + "," + longitude + "&output=jsonp"
 					that.$jsonp(
-							url
-					 ).then(re => {
+						url
+					).then(re => {
 						that.form.address = re.result.formatted_addresses.recommend
 					})
 				}
-				
+
 			})
 			uni.getSystemInfo({
 				complete(res) {
@@ -169,13 +184,13 @@
 
 		},
 		methods: {
-			loadDep(){
+			loadDep() {
 				var that = this
 				that.util.request({
 					api: '/api/mobile/other/department-list',
 					method: "get",
 					data: {
-						is_tree:0
+						is_tree: 0
 					},
 					utilSuccess: function(res) {
 						that.rainArr.depList = res
@@ -185,41 +200,41 @@
 					}
 				});
 			},
-			radioGroupChange(e){
-					console.log(e)
-				if(e==0){
+			radioGroupChange(e) {
+				console.log(e)
+				if (e == 0) {
 					this.form.result = "";
 					this.dealFilesList = [];
-				}else{
+				} else {
 					this.form.result = this.changeResult;
 					this.dealFilesList = this.changedealFilesList;
 				}
 			},
-			confirmDepType(val){
+			confirmDepType(val) {
 				var that = this
 				console.log(val)
 				that.form.feedback_department_id = val[0].value
 				that.depName = val[0].label
-				
+
 			},
-			toremove(index, lists, name,whatfile) {
-				if(whatfile=="filesList"){
-					this.filesList.splice(index,1)
+			toremove(index, lists, name, whatfile) {
+				if (whatfile == "filesList") {
+					this.filesList.splice(index, 1)
 					// this.form.files_list = list;
 				}
-				if(whatfile=="dealFilesList"){
-					this.dealFilesList.splice(index,1)
+				if (whatfile == "dealFilesList") {
+					this.dealFilesList.splice(index, 1)
 					// this.form.files_end_list = list;
 				}
 			},
-			onprogress(res){
+			onprogress(res) {
 				uni.showToast({
 					icon: "none",
 					title: "上传中",
 					duration: 2000
 				})
 			},
-			tosuccess(){
+			tosuccess() {
 				uni.showToast({
 					icon: "none",
 					title: "上传成功",
@@ -229,36 +244,36 @@
 			toupload(lists, name, whatfile) {
 				var that = this;
 				let list = [];
-				if(whatfile=="filesList"){
+				if (whatfile == "filesList") {
 					that.filesList = lists
 					// this.form.files_list = list;
 				}
-				if(whatfile=="dealFilesList"){
+				if (whatfile == "dealFilesList") {
 					that.dealFilesList = lists;
-					
+
 				}
 			},
 			submit() {
 				let that = this;
 				let list = [];
-				let deallist=[];
-				for(var mod of that.filesList){
-					if( mod.response){
+				let deallist = [];
+				for (var mod of that.filesList) {
+					if (mod.response) {
 						list.push({
 							upload_id: mod.response.id
 						})
-					}else{
+					} else {
 						list.push({
-							upload_id:mod.id
+							upload_id: mod.id
 						})
 					}
 				}
-				for(var mod of that.dealFilesList){
-					if( mod.response){
+				for (var mod of that.dealFilesList) {
+					if (mod.response) {
 						deallist.push({
 							upload_id: mod.response.id
 						})
-					}else{
+					} else {
 						deallist.push({
 							upload_id: mod.id
 						})
@@ -268,13 +283,13 @@
 				that.form.files_end_list = deallist;
 				that.changeResult = that.form.result
 				that.changedealFilesList = that.deallist
-				console.log("form",that.form)
+				console.log("form", that.form)
 				// return;
 				// return;
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						console.log('验证通过');
-						if(that.infoId){
+						if (that.infoId) {
 							that.util.request({
 								api: '/api/mobile/mobile-worksheet/save',
 								method: "POST",
@@ -293,7 +308,7 @@
 									that.util.alert(res);
 								}
 							});
-						}else{
+						} else {
 							that.util.request({
 								api: '/api/mobile/mobile-worksheet/store',
 								method: "POST",
@@ -313,7 +328,7 @@
 								}
 							});
 						}
-						
+
 					} else {
 						console.log('验证失败');
 					}
@@ -324,18 +339,18 @@
 					url: "../orderList/orderList"
 				})
 			},
-			showInfo(id){
+			showInfo(id) {
 				var that = this;
 				that.util.request({
 					api: '/api/mobile/mobile-worksheet/show',
 					method: "get",
 					data: {
-						id:id
+						id: id
 					},
 					utilSuccess: function(result) {
 						that.form = result;
-						for(var m of that.rainArr.depList){
-							if(result.feedback_department_id==m.id){
+						for (var m of that.rainArr.depList) {
+							if (result.feedback_department_id == m.id) {
 								console.log(m)
 								that.depName = m.name
 							}
@@ -343,19 +358,19 @@
 						let _files = [];
 						let _dealfiles = [];
 						for (var mod of result.worksheet_files) {
-						  let m = Object.assign({}, mod);
-						  m.url = mod.files.url;
-						  m.id = mod.files.id;
-						  m.name = mod.files.original_name;
-						  _files.push(m);
+							let m = Object.assign({}, mod);
+							m.url = mod.files.url;
+							m.id = mod.files.id;
+							m.name = mod.files.original_name;
+							_files.push(m);
 						}
-						
+
 						for (var mod of result.worksheet_end_files) {
-						  let m = Object.assign({}, mod);
-						  m.url = mod.files.url;
-						  m.id = mod.files.id;
-						  m.name = mod.files.original_name;
-						  _dealfiles.push(m);
+							let m = Object.assign({}, mod);
+							m.url = mod.files.url;
+							m.id = mod.files.id;
+							m.name = mod.files.original_name;
+							_dealfiles.push(m);
 						}
 						that.filesList = _files
 						that.dealFilesList = _dealfiles
@@ -368,7 +383,7 @@
 					}
 				});
 			},
-			
+
 			chooseLocation(e) { //打开地图选择位置
 				var that = this;
 				uni.chooseLocation({
@@ -394,4 +409,4 @@
 		color: #fff;
 		padding: 20rpx 30rpx;
 	}
-</style>
+</style>
diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index 64e08f2..b8bfad2 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -114,10 +114,23 @@
 			uni.getLocation({
 				type: "gcj02",
 				success(res) {
-					that.location = res;
-					that.form.latitude = res.latitude;
-					that.form.longitude = res.longitude;
-					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
+					that.location = res;
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
+						loc = window.android.getLocInfo();
+					}
+					if (loc) {
+						that.form.latitude = JSON.parse(loc).lat;
+						that.form.longitude = JSON.parse(loc).lon;
+					} else {
+						that.form.latitude = res.latitude;
+						that.form.longitude = res.longitude;
+					}
+					const url =
+						"https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location=" +
+						that.form.latitude + "," + that.form.longitude + "&output=jsonp"
+					
 					that.$jsonp(
 							url
 					 ).then(re => {
diff --git a/packageB/pages/dailyInspection/dailyInspection.vue b/packageB/pages/dailyInspection/dailyInspection.vue
index a940d2c..04e3ad0 100644
--- a/packageB/pages/dailyInspection/dailyInspection.vue
+++ b/packageB/pages/dailyInspection/dailyInspection.vue
@@ -2,24 +2,22 @@
 	<view class="content">
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="巡查项目" label-position="top" prop="name" required>
-				<u-input v-model="form.name" type="text" :border="true" placeholder="请填写巡查项目"/>
+				<u-input v-model="form.name" type="text" :border="true" placeholder="请填写巡查项目" />
 			</u-form-item>
 			<u-form-item label-position="top" label="巡查记录" prop="content">
 				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
 			</u-form-item>
 			<u-form-item label-position="top" label="现场照片">
 				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
+					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList"
+					:form-data="otherData" :show-tips="false"
+					@on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
 					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
 				</u-upload>
 			</u-form-item>
 			<u-form-item label-position="top" label="处理方式">
 				<u-radio-group v-model="normalstatus">
-					<u-radio 
-						@change="radioChange" 
-						v-for="(item, index) in statuss" :key="index" 
-						:name="item.id"
-					>
+					<u-radio @change="radioChange" v-for="(item, index) in statuss" :key="index" :name="item.id">
 						{{item.name}}
 					</u-radio>
 				</u-radio-group>
@@ -35,10 +33,12 @@
 				<u-form-item label-position="top" label="处理记录" prop="deal_content">
 					<u-input v-model="form.deal_content" type='textarea' height='100' :border="true" />
 				</u-form-item>
-				
+
 				<u-form-item label-position="top" label="处理后照片">
 					<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="dealFilesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
+						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess"
+						:file-list="dealFilesList" :form-data="otherData" :show-tips="false"
+						@on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
 						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
 					</u-upload>
 				</u-form-item>
@@ -46,8 +46,9 @@
 			<div v-if="normalstatus==2 && nextStatusId==3">
 				<u-form-item label="位置" label-position="top" required>
 					<!-- <text>{{form.address}}</text> -->
-					<u-input v-model="form.address" disabled type='text'/>
-					<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
+					<u-input v-model="form.address" disabled type='text' />
+					<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取
+					</u-button>
 				</u-form-item>
 			</div>
 		</u-form>
@@ -64,46 +65,44 @@
 					token: ""
 				},
 				showMap: false,
-				nextStatus:"可现场处理",
-				normalstatus:1,
-				nextStatusId:2,
-				nextShow:false,
+				nextStatus: "可现场处理",
+				normalstatus: 1,
+				nextStatusId: 2,
+				nextShow: false,
 				action: "",
-				infoId:"",
-				slist:[
-					{
-						id:2,
-						name:"可现场处理"
+				infoId: "",
+				slist: [{
+						id: 2,
+						name: "可现场处理"
 					},
 					{
-						id:3,
-						name:"不可现场处理"
+						id: 3,
+						name: "不可现场处理"
 					}
 				],
-				statuss:[
-					{
-						id:1,
-						name:"无异常"
+				statuss: [{
+						id: 1,
+						name: "无异常"
 					},
 					{
-						id:2,
-						name:"有异常"
+						id: 2,
+						name: "有异常"
 					}
 				],
-				filesList:[],
-				dealFilesList:[],
+				filesList: [],
+				dealFilesList: [],
 				form: {
-					name:"",
-					content:"",
-					status:1,
-					deal_content:"",
-					deal_longitude:"",
-					deal_latitude:"",
-					address:"",
-					files_list:"",
-					deal_files_list:""
+					name: "",
+					content: "",
+					status: 1,
+					deal_content: "",
+					deal_longitude: "",
+					deal_latitude: "",
+					address: "",
+					files_list: "",
+					deal_files_list: ""
 				},
-				qqmapsdk:"",
+				qqmapsdk: "",
 				width: 300,
 				height: 300,
 				rules: {
@@ -118,11 +117,11 @@
 		},
 		onLoad(options) {
 			var that = this;
-			if(options.id){
+			if (options.id) {
 				this.infoId = options.id;
 				this.showInfo(this.infoId);
 			}
-			
+
 			this.action = this.util.HOST + "/api/mobile/upload-file";
 			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
 		},
@@ -131,18 +130,32 @@
 			let that = this;
 			uni.getLocation({
 				type: "gcj02",
-				geocode:true,
+				geocode: true,
 				success(res) {
-					that.form.deal_latitude = res.latitude;
-					that.form.deal_longitude = res.longitude;
-					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
+						loc = window.android.getLocInfo();
+					}
+					if (loc) {
+						that.form.deal_latitude = JSON.parse(loc).lat;
+						that.form.deal_longitude = JSON.parse(loc).lon;
+					} else {
+						that.form.deal_latitude = res.latitude;
+						that.form.deal_longitude = res.longitude;
+					}
+					const url =
+						"https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location=" +
+						that.form.deal_latitude + "," + that.form.deal_longitude + "&output=jsonp"
+
+
 					that.$jsonp(
-							url
-					 ).then(re => {
+						url
+					).then(re => {
 						that.form.address = re.result.formatted_addresses.recommend
 					})
 				}
-				
+
 			})
 			uni.getSystemInfo({
 				complete(res) {
@@ -153,24 +166,24 @@
 
 		},
 		methods: {
-			toremove(index, lists, name,whatfile) {
-				if(whatfile=="filesList"){
-					this.filesList.splice(index,1)
+			toremove(index, lists, name, whatfile) {
+				if (whatfile == "filesList") {
+					this.filesList.splice(index, 1)
 					// this.form.files_list = list;
 				}
-				if(whatfile=="dealFilesList"){
-					this.dealFilesList.splice(index,1)
+				if (whatfile == "dealFilesList") {
+					this.dealFilesList.splice(index, 1)
 					// this.form.deal_files_list = list;
 				}
 			},
-			onprogress(res){
+			onprogress(res) {
 				uni.showToast({
 					icon: "none",
 					title: "上传中",
 					duration: 2000
 				})
 			},
-			tosuccess(){
+			tosuccess() {
 				uni.showToast({
 					icon: "none",
 					title: "上传成功",
@@ -180,16 +193,16 @@
 			toupload(lists, name, whatfile) {
 				var that = this;
 				let list = [];
-				if(whatfile=="filesList"){
+				if (whatfile == "filesList") {
 					that.filesList = lists
 					// this.form.files_list = list;
 				}
-				if(whatfile=="dealFilesList"){
+				if (whatfile == "dealFilesList") {
 					that.dealFilesList = lists;
-					
+
 				}
 			},
-			radioChange(val){
+			radioChange(val) {
 				console.log(val)
 			},
 			confirmNext(e) {
@@ -200,33 +213,33 @@
 			},
 			submit() {
 				let that = this;
-				if(that.nextStatusId==3){
+				if (that.nextStatusId == 3) {
 					that.form.status = that.nextStatusId
-				}else{
+				} else {
 					that.form.status = that.normalstatus;
 					that.form.deal_latitude = "";
 					that.form.deal_longitude = "";
 					that.form.address = "";
 				}
 				let list = [];
-				let deallist=[];
-				for(var mod of that.filesList){
-					if( mod.response){
+				let deallist = [];
+				for (var mod of that.filesList) {
+					if (mod.response) {
 						list.push({
 							upload_id: mod.response.id
 						})
-					}else{
+					} else {
 						list.push({
-							upload_id:mod.id
+							upload_id: mod.id
 						})
 					}
 				}
-				for(var mod of that.dealFilesList){
-					if( mod.response){
+				for (var mod of that.dealFilesList) {
+					if (mod.response) {
 						deallist.push({
 							upload_id: mod.response.id
 						})
-					}else{
+					} else {
 						deallist.push({
 							upload_id: mod.id
 						})
@@ -238,7 +251,7 @@
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						console.log('验证通过');
-						if(that.infoId){
+						if (that.infoId) {
 							that.util.request({
 								api: '/api/mobile/daily-inspection/save',
 								method: "POST",
@@ -257,7 +270,7 @@
 									that.util.alert(res);
 								}
 							});
-						}else{
+						} else {
 							that.util.request({
 								api: '/api/mobile/daily-inspection/store',
 								method: "POST",
@@ -277,7 +290,7 @@
 								}
 							});
 						}
-						
+
 					} else {
 						console.log('验证失败');
 					}
@@ -288,18 +301,18 @@
 					url: "../dailyList/dailyList"
 				})
 			},
-			showInfo(id){
+			showInfo(id) {
 				var that = this;
 				that.util.request({
 					api: '/api/mobile/daily-inspection/show',
 					method: "get",
 					data: {
-						id:id
+						id: id
 					},
 					utilSuccess: function(result) {
 						that.form = result;
 						that.normalstatus = result.status;
-						if(result.status==3){
+						if (result.status == 3) {
 							that.nextStatusId = 3;
 							that.normalstatus = 2;
 							that.nextStatus = "不可现场处理"
@@ -307,19 +320,19 @@
 						let _files = [];
 						let _dealfiles = [];
 						for (var mod of result.daily_inspection_files) {
-						  let m = Object.assign({}, mod);
-						  m.url = mod.files.url;
-						  m.id = mod.files.id;
-						  m.name = mod.files.original_name;
-						  _files.push(m);
+							let m = Object.assign({}, mod);
+							m.url = mod.files.url;
+							m.id = mod.files.id;
+							m.name = mod.files.original_name;
+							_files.push(m);
 						}
-						
+
 						for (var mod of result.daily_inspection_deal_files) {
-						  let m = Object.assign({}, mod);
-						  m.url = mod.files.url;
-						  m.id = mod.files.id;
-						  m.name = mod.files.original_name;
-						  _dealfiles.push(m);
+							let m = Object.assign({}, mod);
+							m.url = mod.files.url;
+							m.id = mod.files.id;
+							m.name = mod.files.original_name;
+							_dealfiles.push(m);
 						}
 						that.filesList = _files
 						that.dealFilesList = _dealfiles
@@ -330,12 +343,12 @@
 					}
 				});
 			},
-			
+
 			chooseLocation(e) { //打开地图选择位置
 				var that = this;
 				uni.chooseLocation({
-					longitude : that.form.deal_longitude,
-					latitude : that.form.deal_latitude,
+					longitude: that.form.deal_longitude,
+					latitude: that.form.deal_latitude,
 					success: res => {
 						that.form.address = res.name;
 						that.form.deal_longitude = res.longitude;
@@ -359,4 +372,4 @@
 		color: #fff;
 		padding: 20rpx 30rpx;
 	}
-</style>
+</style>
diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue
index d7620e9..d040369 100644
--- a/raininspection/raininspection/raininspection.vue
+++ b/raininspection/raininspection/raininspection.vue
@@ -1,719 +1,736 @@
-<template>
-	<view class="content">
-		<view>
-			所属道路：{{roadName}}
-		</view>
-		<u-form :model="form" ref="uForm">
-			<u-form-item v-if='!showInfoId' label="巡查类型" label-position="top" prop="type" required>
-				<u-input placeholder="请选择巡查类型" v-model="typeName" type="select" :border="true" @click="typeShow = true" />
-				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-				<u-select v-model="typeShow" mode="single-column" value-name="id" label-name="name" :list="rainArr.rainTypes"
-					@confirm="confirmType"></u-select>
-			</u-form-item>
-			<u-form-item v-if='showInfoId' label="巡查类型" label-position="top" prop="type" required>
-				<view>
-					{{typeName}}
-				</view>
-			</u-form-item>
-			<u-form-item v-if='formshow' label="巡查内容" label-position="top" prop="type" required>
-				<u-input placeholder="请选择巡查内容" v-model="askName" type="select" :border="true" @click="askShow = true" />
-				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-				<u-select v-model="askShow" mode="single-column" value-name="id" label-name="value" :list="rainArr.askContentList"
-					@confirm="confirmAskType"></u-select>
-			</u-form-item>
-			
-			<view v-if="!formshow">
-				<u-form-item label="工地名称" label-position="top" prop="type" required>
-					<u-input placeholder="请输入工地名称以查询或新建" v-model="buildName" type="input" :border="true" @confirm="selectBuildList" />
-					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-					<u-select :confirm-text="confirmText" v-model="buildShow" mode="single-column" value-name="id" label-name="name" :list="rainArr.buildList"
-						@confirm="confirmBuildType"></u-select>
-				</u-form-item>
-				
-				<u-form-item label="工地编号" label-position="top" prop="number">
-					<u-input placeholder="请填写工地编号" v-model="form.number" type="text" :border="true" />
-				</u-form-item>
-				<u-form-item label="工地类型" label-position="top" prop="type">
-					<u-input placeholder="请选择工地类型" v-model="buildtypeName" type="select" :border="true" @click="buildtypeShow = true" />
-					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-					<u-select v-model="buildtypeShow" mode="single-column" value-name="id" label-name="value" :list="rainArr.buildTypes"
-						@confirm="confirmBuildTypeName"></u-select>
-				</u-form-item>
-				<u-form-item label="工地状态" label-position="top" prop="status">
-					<u-radio-group v-model="form.status">
-						<u-radio 
-							v-for="(item, index) in rainArr.statuss" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item label="备注" label-position="top" prop="remark">
-					<u-input placeholder="请填写备注" v-model="form.remark" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				
-				
-			</view>
-			
-			
-			<u-form-item label="位置" label-position="top" required>
-				<!-- <text>{{form.address}}</text> -->
-				<u-input v-model="form.address" disabled type='text'/>
-				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
-			</u-form-item>
-		
-				
-			<u-form-item label-position="top" label="描述" prop="content" required>
-				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
-			</u-form-item>
-			<u-form-item label-position="top" label="现场照片">
-				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
-					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
-				</u-upload>
-			</u-form-item>
-			
-			<view v-if="!formshow">
-				<u-form-item labelWidth="180" label-position="left" label="是否违法">
-					<u-radio-group v-model="form.is_law">
-						<u-radio 
-							v-for="(item, index) in rainArr.laws" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item v-if='form.is_law==1' label="违规内容" label-position="top" prop="type">
-					<u-input placeholder="请选择违规内容" v-model="lawName" type="select" :border="true" @click="lawshow = true" />
-					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-					<u-select v-model="lawshow" mode="single-column" value-name="id" label-name="value" :list="rainArr.lawTypes"
-						@confirm="confirmLawType"></u-select>
-				</u-form-item>
-			</view>
-			
-			<view v-if="formshow">
-				<u-form-item labelWidth="180" label-position="left" label="是否异常">
-					<u-radio-group v-model="form.is_unusual">
-						<u-radio 
-							v-for="(item, index) in rainArr.unusuals" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item v-if="form.is_unusual==1||form.is_unusual==2" label-position="top" label="异常处置建议" prop="tip">
-					<u-input v-model="form.tip" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				
-				<u-form-item labelWidth="180" label-position="left" label="是否现场处理">
-					<u-radio-group v-model="form.is_scene">
-						<u-radio 
-							v-for="(item, index) in rainArr.scenes" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item v-if="form.is_scene == 1" label-position="top" label="处理结果" prop="result">
-					<u-input v-model="form.result" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				<u-form-item  v-if="form.is_scene == 1" label-position="top" label="处理后照片">
-					<u-upload ref="uUploaddeal" multiple :maxCount="10" :action="action" upload-text="选择附件"
-						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="dealFilesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
-						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
-					</u-upload>
-				</u-form-item>
-			</view>
-		</u-form>
-		<u-button type="primary" @click="submit">提交</u-button>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				otherData: {
-					token: ""
-				},
-				roadName:"",
-				instype:1,
-				typeShow:false,
-				askShow:false,
-				formshow:true,
-				lawshow:false,
-				showInfoId:false,
-				buildShow:false,
-				buildtypeShow:false,
-				buildtypeName:"",
-				typeName:"日常雨水设施",
-				askName:"",
-				lawName:"",
-				buildName:"",
-				confirmText:"确认",
-				dateparams: {
-					year: true,
-					month: true,
-					day: true,
-					hour:true,
-					minute:true,
-					second:true,
-				},
-				rainArr:{
-					buildTypes:[],
-					buildList:[],
-					lawTypes:[],
-					askContentList:[],
-					statuss:[
-						{
-							id:1,
-							name:"在建"
-						},
-						{
-							id:2,
-							name:"完工"
-						},
-					],
-					rainTypes:[
-						{
-							id:1,
-							name:"日常雨水设施"
-						},
-						{
-							id:2,
-							name:"在建工地"
-						}
-					],
-					scenes:[
-						{
-							id:0,
-							name:"否"
-						},
-						{
-							id:1,
-							name:"是"
-						}
-					],
-					laws:[
-						{
-							id:0,
-							name:"否"
-						},
-						{
-							id:1,
-							name:"是"
-						}
-					],
-					unusuals:[
-						{
-							id:0,
-							name:"否"
-						},
-						{
-							id:1,
-							name:"丢失"
-						},
-						{
-							id:2,
-							name:"破损"
-						}
-					]
-				},
-				filesList:[],
-				dealFilesList:[],
-				form:{
-					road_id:'',
-					content:"",
-					ask_content_id:"",
-					is_unusual:0,
-					is_scene:0,
-					result:"",
-					tip:"",
-					address:"",
-					longitude:"",
-					latitude:"",
-					files_list:[],
-					files_end_list:[],
-					building_site_id:"",
-					name:"",
-					number:"",
-					type:"",
-					status:"",
-					remark:"",
-					is_law:"",
-					break_id:""
-				},
-				rules:{
-					content: [{
-						required: true,
-						message: '请填写描述',
-						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['blur'],
-					}]
-				},
-				apis:{
-					store:[
-						"",
-						"/api/mobile/rain-inspection/rain-equipment-store",
-						"/api/mobile/rain-inspection/building-site-content-store"
-					],
-					save:[
-						"",
-						"/api/mobile/rain-inspection/rain-equipment-save",
-						"/api/mobile/rain-inspection/building-site-content-save"
-					]
-				}
-			}
-		},
-		onLoad(options) {
-			var that = this;
-			this.loadAskContent();
-			this.loadLawTypes();
-			// this.loadBuild();
-			this.loadBuildType();
-			if(options.id){
-				this.infoId = options.id;
-				this.showInfoId = true
-				setTimeout(function(){
-					that.showInfo(that.infoId);
-				},1000)
-			}
-			if(options.roadid){
-				this.form.road_id = options.roadid
-				this.roadName = options.roadname
-			}
-			
-			this.action = this.util.HOST + "/api/mobile/upload-file";
-			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
-		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
-			let that = this;
-			uni.getLocation({
-				type: "gcj02",
-				geocode:true,
-				success(res) {
-					that.form.latitude = res.latitude;
-					that.form.longitude = res.longitude;
-					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
-					that.$jsonp(
-							url
-					 ).then(re => {
-						that.form.address = re.result.formatted_addresses.recommend
-					})
-				}
-				
-			})
-			uni.getSystemInfo({
-				complete(res) {
-					that.width = res.screenWidth * .8
-					that.height = res.screenHeight * .6
-				}
-			})
-		
-		},
-		methods: {
-			selectBuildList(){
-				var that = this
-				// that.rainArr.buildList = []
-				that.loadBuild()
-				console.log("123",that.rainArr.buildList)
-				// if(that.rainArr.buildList){
-					
-				// }
-				
-			},
-			confirmBuildTypeName(val){
-				console.log(val)
-				var that = this
-				that.buildtypeName = val[0].label
-				that.form.type = val[0].value
-			},
-			confirmBuildType(val){
-				var that = this
-				console.log(val)
-				if(!val[0].value){
-					that.form.name = that.buildName
-					return
-				}
-				let buildinfo = val[0].extra;
-				that.buildName = val[0].label
-				that.form.building_site_id = val[0].value
-				that.form.name = buildinfo.name
-				that.form.number=buildinfo.number
-				that.form.type=buildinfo.type
-				that.form.status=buildinfo.status
-				that.form.remark=buildinfo.remark
-				that.form.latitude = buildinfo.latitude;
-				that.form.longitude = buildinfo.longitude;
-				that.form.address = buildinfo.address;
-				for(var m of that.rainArr.buildTypes){
-					if(that.form.type==m.id){
-						that.buildtypeName = m.value
-					}
-				}
-				
-			},
-			confirmAskType(val){
-				console.log(val)
-				var that = this
-				that.askName = val[0].label
-				that.form.ask_content_id = val[0].value
-			},
-			confirmLawType(val){
-				console.log(val)
-				var that = this
-				that.lawName = val[0].label
-				that.form.break_id = val[0].value
-			},
-			confirmType(val){
-				console.log(val)
-				var that = this
-				this.$refs.uForm.resetFields();
-				that.typeName = val[0].label
-				that.instype = val[0].value
-				that.formshow = true
-				that.filesList = [];
-				this.$refs.uUpload.clear();
-				that.dealFilesList = [];
-				if(that.form.is_scene==1){
-					this.$refs.uUploaddeal.clear();
-				}
-				that.form.is_unusual = 0
-				that.form.is_scene = 0
-				that.form.is_law = 0
-				if(val[0].value==2){
-					that.formshow = false
-					that.lawshow = false
-				}
-				console.log("res",that.form)
-			},
-			chooseLocation(e) { //打开地图选择位置
-				var that = this;
-				uni.chooseLocation({
-					longitude : that.form.longitude,
-					latitude : that.form.latitude,
-					success: res => {
-						that.form.address = res.name;
-						that.form.longitude = res.longitude;
-						that.form.latitude = res.latitude;
-					}
-				});
-			},
-			toremove(index, lists, name,whatfile) {
-				if(whatfile=="filesList"){
-					this.filesList.splice(index,1)
-					// this.form.files_list = list;
-				}
-				if(whatfile=="dealFilesList"){
-					this.dealFilesList.splice(index,1)
-					// this.form.deal_files_list = list;
-				}
-			},
-			onprogress(res){
-				uni.showToast({
-					icon: "none",
-					title: "上传中",
-					duration: 2000
-				})
-			},
-			tosuccess(){
-				uni.showToast({
-					icon: "none",
-					title: "上传成功",
-					duration: 2000
-				})
-			},
-			toupload(lists, name, whatfile) {
-				var that = this;
-				let list = [];
-				if(whatfile=="filesList"){
-					that.filesList = lists
-					// this.form.files_list = list;
-				}
-				if(whatfile=="dealFilesList"){
-					that.dealFilesList = lists;
-					
-				}
-			},
-			afterSubmit(res) {
-				uni.redirectTo({
-					url: "../raininspectionlist/raininspectionList"
-				})
-			},
-			loadBuildType(){
-				var that = this;
-				that.util.request({
-					api: '/api/admin/parameter/show',
-					method: "get",
-					data: {
-						number:"siteType"
-					},
-					utilSuccess: function(result) {
-						that.rainArr.buildTypes = result.detail
-						
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			loadBuild(){
-				var that = this;
-				that.util.request({
-					api: '/api/mobile/rain-inspection/all-building-site',
-					method: "get",
-					data: {
-						keyword:that.buildName
-					},
-					utilSuccess: function(result) {
-						// that.rainArr.buildList = result
-						let arr=[];
-						if(result.length>0){
-							for(var m of result){
-								m.extra = m
-								arr.push(m)
-							}
-							that.confirmText = "确认"
-						}else{
-							arr.push({
-								name:that.buildName
-							})
-							that.confirmText = "新增"
-						}
-						
-						that.rainArr.buildList = arr
-						that.buildShow = true
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			loadLawTypes(){
-				var that = this;
-				that.util.request({
-					api: '/api/admin/parameter/show',
-					method: "get",
-					data: {
-						number:"siteLaw"
-					},
-					utilSuccess: function(result) {
-						that.rainArr.lawTypes = result.detail
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			loadAskContent(){
-				var that = this;
-				that.util.request({
-					api: '/api/admin/parameter/show',
-					method: "get",
-					data: {
-						number:"equiementList"
-					},
-					utilSuccess: function(result) {
-						that.rainArr.askContentList = result.detail
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			
-			showInfo(id){
-				var that = this;
-				that.util.request({
-					api: '/api/mobile/rain-inspection/show',
-					method: "get",
-					data: {
-						id:id
-					},
-					utilSuccess: function(result) {
-						
-						switch(result.type){
-						  case 1:
-							that.typeName = "日常雨水设施"
-							that.instype = 1
-						    that.form = result.rain_equipment_info;
-						    that.form.rain_equipment_id = result.rain_equipment_id;
-							that.askName = result.rain_equipment_info.ask_content_detail.value
-							that.roadName = result.rain_equipment_info.road?result.rain_equipment_info.road.name:""
-						    let _files = [];
-						    for (var mod of result.rain_equipment_info.rain_equipment_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "before";
-						      _files.push(m);
-						    }
-						    that.filesList = _files;
-						
-						    let _filesafter = [];
-						    for (var mod of result.rain_equipment_info.rain_equipment_end_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "after";
-						      _filesafter.push(m);
-						    }
-						    that.dealFilesList = _filesafter;
-							console.log(that.form)
-						    break;
-						  case 2:
-							that.typeName = "在建工地"
-							that.formshow = false
-							that.instype = 2
-						    that.form = result.building_site_info;
-						    that.form.building_site_content_id = result.building_site_content_id;
-							that.buildName = result.building_site_info.building_site.name
-							that.form.building_site_id = result.building_site_info.building_site.id
-							that.form.name = result.building_site_info.building_site.name
-							that.form.number=result.building_site_info.building_site.number
-							that.form.type=result.building_site_info.building_site.type
-							that.form.status=result.building_site_info.building_site.status
-							that.form.remark=result.building_site_info.building_site.remark
-							that.form.latitude = result.building_site_info.building_site.latitude;
-							that.form.longitude = result.building_site_info.building_site.longitude;
-							that.form.address = result.building_site_info.building_site.address;
-							that.roadName = result.building_site_info.road?result.building_site_info.road.name:""
-							for(var m of that.rainArr.buildTypes){
-								if(result.building_site_info.building_site.type==m.id){
-									that.buildtypeName = m.value;
-								}
-							}
-							for(var m of that.rainArr.lawTypes){
-								if(result.building_site_info.break_id==m.id){
-									that.lawName = m.value;
-								}
-							}
-						    let discharge_files = [];
-						    for (var mod of result.building_site_info.building_site_content_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "before";
-						      discharge_files.push(m);
-						    }
-						    that.filesList = discharge_files;
-						
-							// that.form.type = result.type
-						    break;
-						}
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			
-			submit(){
-				var that = this;
-				let list = [];
-				let deallist=[];
-				for(var mod of that.filesList){
-					if( mod.response){
-						list.push({
-							upload_id: mod.response.id
-						})
-					}else{
-						list.push({
-							upload_id:mod.id
-						})
-					}
-				}
-				for(var mod of that.dealFilesList){
-					if( mod.response){
-						deallist.push({
-							upload_id: mod.response.id
-						})
-					}else{
-						deallist.push({
-							upload_id: mod.id
-						})
-					}
-				}
-				that.form.files_list = list;
-				that.form.files_end_list = deallist;
-				let api = "";
-				if(this.infoId){
-					api = this.apis.save[this.instype]
-				}else{
-					api = this.apis.store[this.instype]
-				}
-
-				this.$refs.uForm.validate(valid => {
-				console.log(api)
-				console.log("form",that.form)
-				// return
-					if (valid) {
-						console.log('验证通过');
-						// if(that.infoId){
-							that.util.request({
-								api: api,
-								method: "POST",
-								data: that.form,
-								utilSuccess: function(res) {
-									uni.showToast({
-										icon: "none",
-										title: "提交成功",
-										complete() {
-											that.afterSubmit(res);
-										},
-										duration: 2000
-									})
-								},
-								utilFail: function(res) {
-									that.util.alert(res);
-								}
-							});
-						// }else{
-						// 	that.util.request({
-						// 		api: api,
-						// 		method: "POST",
-						// 		data: that.form,
-						// 		utilSuccess: function(res) {
-						// 			uni.showToast({
-						// 				icon: "none",
-						// 				title: "提交成功",
-						// 				complete() {
-						// 					that.afterSubmit(res);
-						// 				},
-						// 				duration: 2000
-						// 			})
-						// 		},
-						// 		utilFail: function(res) {
-						// 			that.util.alert(res);
-						// 		}
-						// 	});
-						// }
-						
-					} else {
-						console.log('验证失败');
-					}
-				});
-			},
-			
-			
-		}
-	}
-</script>
-
-<style>
-	.content {
-		padding: 20rpx;
-	}
-
-	.popuptitle {
-		background: #0385e5;
-		color: #fff;
-		padding: 20rpx 30rpx;
-	}
+<template>
+	<view class="content">
+		<view>
+			所属道路：{{roadName}}
+		</view>
+		<u-form :model="form" ref="uForm">
+			<u-form-item v-if='!showInfoId' label="巡查类型" label-position="top" prop="type" required>
+				<u-input placeholder="请选择巡查类型" v-model="typeName" type="select" :border="true"
+					@click="typeShow = true" />
+				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+				<u-select v-model="typeShow" mode="single-column" value-name="id" label-name="name"
+					:list="rainArr.rainTypes" @confirm="confirmType"></u-select>
+			</u-form-item>
+			<u-form-item v-if='showInfoId' label="巡查类型" label-position="top" prop="type" required>
+				<view>
+					{{typeName}}
+				</view>
+			</u-form-item>
+			<block v-if='formshow'>
+				<u-form-item label="巡查内容" label-position="top" prop="type" required>
+					<u-input placeholder="请选择巡查内容" v-model="askName" type="select" :border="true"
+						@click="askShow = true" />
+					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+					<u-select v-model="askShow" mode="single-column" value-name="id" label-name="value"
+						:list="rainArr.askContentList" @confirm="confirmAskType"></u-select>
+				</u-form-item>
+
+
+				<u-form-item label="覆盖范围" label-position="top" prop="number">
+					<u-input placeholder="请填写覆盖范围" v-model="form.number" type="text" :border="true" />
+					<u-tag text="米" mode="dark" v-slot="right" />
+				</u-form-item>
+				<u-form-item label="点位名称" label-position="top" prop="number">
+					<u-input placeholder="请填写点位名称" v-model="form.number" type="text" :border="true" />
+				</u-form-item>
+			</block>
+			<view v-if="!formshow">
+				<u-form-item label="工地名称" label-position="top" prop="type" required>
+					<u-input placeholder="请输入工地名称以查询或新建" v-model="buildName" type="input" :border="true"
+						@confirm="selectBuildList" />
+					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+					<u-select :confirm-text="confirmText" v-model="buildShow" mode="single-column" value-name="id"
+						label-name="name" :list="rainArr.buildList" @confirm="confirmBuildType"></u-select>
+				</u-form-item>
+
+				<u-form-item label="工地编号" label-position="top" prop="number">
+					<u-input placeholder="请填写工地编号" v-model="form.number" type="text" :border="true" />
+				</u-form-item>
+				<u-form-item label="工地类型" label-position="top" prop="type">
+					<u-input placeholder="请选择工地类型" v-model="buildtypeName" type="select" :border="true"
+						@click="buildtypeShow = true" />
+					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+					<u-select v-model="buildtypeShow" mode="single-column" value-name="id" label-name="value"
+						:list="rainArr.buildTypes" @confirm="confirmBuildTypeName"></u-select>
+				</u-form-item>
+				<u-form-item label="工地状态" label-position="top" prop="status">
+					<u-radio-group v-model="form.status">
+						<u-radio v-for="(item, index) in rainArr.statuss" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item label="备注" label-position="top" prop="remark">
+					<u-input placeholder="请填写备注" v-model="form.remark" type='textarea' height='100' :border="true" />
+				</u-form-item>
+
+
+			</view>
+
+
+			<u-form-item label="位置" label-position="top" required>
+				<!-- <text>{{form.address}}</text> -->
+				<u-input v-model="form.address" disabled type='text' />
+				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
+			</u-form-item>
+
+
+			<u-form-item label-position="top" label="描述" prop="content" required>
+				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
+			</u-form-item>
+			<u-form-item label-position="top" label="现场照片">
+				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
+					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList"
+					:form-data="otherData" :show-tips="false"
+					@on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
+					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
+				</u-upload>
+			</u-form-item>
+
+			<view v-if="!formshow">
+				<u-form-item labelWidth="180" label-position="left" label="是否违法">
+					<u-radio-group v-model="form.is_law">
+						<u-radio v-for="(item, index) in rainArr.laws" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item v-if='form.is_law==1' label="违规内容" label-position="top" prop="type">
+					<u-input placeholder="请选择违规内容" v-model="lawName" type="select" :border="true"
+						@click="lawshow = true" />
+					<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+					<u-select v-model="lawshow" mode="single-column" value-name="id" label-name="value"
+						:list="rainArr.lawTypes" @confirm="confirmLawType"></u-select>
+				</u-form-item>
+			</view>
+
+			<view v-if="formshow">
+				<u-form-item labelWidth="180" label-position="left" label="是否异常">
+					<u-radio-group v-model="form.is_unusual">
+						<u-radio v-for="(item, index) in rainArr.unusuals" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item v-if="form.is_unusual==1||form.is_unusual==2" label-position="top" label="异常处置建议"
+					prop="tip">
+					<u-input v-model="form.tip" type='textarea' height='100' :border="true" />
+				</u-form-item>
+
+				<u-form-item labelWidth="180" label-position="left" label="是否现场处理">
+					<u-radio-group v-model="form.is_scene">
+						<u-radio v-for="(item, index) in rainArr.scenes" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item v-if="form.is_scene == 1" label-position="top" label="处理结果" prop="result">
+					<u-input v-model="form.result" type='textarea' height='100' :border="true" />
+				</u-form-item>
+				<u-form-item v-if="form.is_scene == 1" label-position="top" label="处理后照片">
+					<u-upload ref="uUploaddeal" multiple :maxCount="10" :action="action" upload-text="选择附件"
+						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess"
+						:file-list="dealFilesList" :form-data="otherData" :show-tips="false"
+						@on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
+						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
+					</u-upload>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-button type="primary" @click="submit">提交</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				otherData: {
+					token: ""
+				},
+				roadName: "",
+				instype: 1,
+				typeShow: false,
+				askShow: false,
+				formshow: true,
+				lawshow: false,
+				showInfoId: false,
+				buildShow: false,
+				buildtypeShow: false,
+				buildtypeName: "",
+				typeName: "日常雨水设施",
+				askName: "",
+				lawName: "",
+				buildName: "",
+				confirmText: "确认",
+				dateparams: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true,
+				},
+				rainArr: {
+					buildTypes: [],
+					buildList: [],
+					lawTypes: [],
+					askContentList: [],
+					statuss: [{
+							id: 1,
+							name: "在建"
+						},
+						{
+							id: 2,
+							name: "完工"
+						},
+					],
+					rainTypes: [{
+							id: 1,
+							name: "日常雨水设施"
+						},
+						{
+							id: 2,
+							name: "在建工地"
+						}
+					],
+					scenes: [{
+							id: 0,
+							name: "否"
+						},
+						{
+							id: 1,
+							name: "是"
+						}
+					],
+					laws: [{
+							id: 0,
+							name: "否"
+						},
+						{
+							id: 1,
+							name: "是"
+						}
+					],
+					unusuals: [{
+							id: 0,
+							name: "否"
+						},
+						{
+							id: 1,
+							name: "丢失"
+						},
+						{
+							id: 2,
+							name: "破损"
+						}
+					]
+				},
+				filesList: [],
+				dealFilesList: [],
+				form: {
+					road_id: '',
+					content: "",
+					ask_content_id: "",
+					is_unusual: 0,
+					is_scene: 0,
+					result: "",
+					tip: "",
+					address: "",
+					longitude: "",
+					latitude: "",
+					files_list: [],
+					files_end_list: [],
+					building_site_id: "",
+					name: "",
+					number: "",
+					type: "",
+					status: "",
+					remark: "",
+					is_law: "",
+					break_id: ""
+				},
+				rules: {
+					content: [{
+						required: true,
+						message: '请填写描述',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['blur'],
+					}]
+				},
+				apis: {
+					store: [
+						"",
+						"/api/mobile/rain-inspection/rain-equipment-store",
+						"/api/mobile/rain-inspection/building-site-content-store"
+					],
+					save: [
+						"",
+						"/api/mobile/rain-inspection/rain-equipment-save",
+						"/api/mobile/rain-inspection/building-site-content-save"
+					]
+				}
+			}
+		},
+		onLoad(options) {
+			var that = this;
+			this.loadAskContent();
+			this.loadLawTypes();
+			// this.loadBuild();
+			this.loadBuildType();
+			if (options.id) {
+				this.infoId = options.id;
+				this.showInfoId = true
+				setTimeout(function() {
+					that.showInfo(that.infoId);
+				}, 1000)
+			}
+			if (options.roadid) {
+				this.form.road_id = options.roadid
+				this.roadName = options.roadname
+			}
+
+			this.action = this.util.HOST + "/api/mobile/upload-file";
+			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+			let that = this;
+			uni.getLocation({
+				type: "gcj02",
+				geocode: true,
+				success(res) {
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
+						loc = window.android.getLocInfo();
+					}
+					if (loc) {
+						that.form.latitude = JSON.parse(loc).lat;
+						that.form.longitude = JSON.parse(loc).lon;
+					} else {
+						that.form.latitude = res.latitude;
+						that.form.longitude = res.longitude;
+					}
+					const url =
+						"https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location=" +
+						that.form.latitude + "," + that.form.longitude + "&output=jsonp"
+					that.$jsonp(
+						url
+					).then(re => {
+						that.form.address = re.result.formatted_addresses.recommend
+					})
+				}
+
+			})
+			uni.getSystemInfo({
+				complete(res) {
+					that.width = res.screenWidth * .8
+					that.height = res.screenHeight * .6
+				}
+			})
+
+		},
+		methods: {
+			selectBuildList() {
+				var that = this
+				// that.rainArr.buildList = []
+				that.loadBuild()
+				console.log("123", that.rainArr.buildList)
+				// if(that.rainArr.buildList){
+
+				// }
+
+			},
+			confirmBuildTypeName(val) {
+				console.log(val)
+				var that = this
+				that.buildtypeName = val[0].label
+				that.form.type = val[0].value
+			},
+			confirmBuildType(val) {
+				var that = this
+				console.log(val)
+				if (!val[0].value) {
+					that.form.name = that.buildName
+					return
+				}
+				let buildinfo = val[0].extra;
+				that.buildName = val[0].label
+				that.form.building_site_id = val[0].value
+				that.form.name = buildinfo.name
+				that.form.number = buildinfo.number
+				that.form.type = buildinfo.type
+				that.form.status = buildinfo.status
+				that.form.remark = buildinfo.remark
+				that.form.latitude = buildinfo.latitude;
+				that.form.longitude = buildinfo.longitude;
+				that.form.address = buildinfo.address;
+				for (var m of that.rainArr.buildTypes) {
+					if (that.form.type == m.id) {
+						that.buildtypeName = m.value
+					}
+				}
+
+			},
+			confirmAskType(val) {
+				console.log(val)
+				var that = this
+				that.askName = val[0].label
+				that.form.ask_content_id = val[0].value
+			},
+			confirmLawType(val) {
+				console.log(val)
+				var that = this
+				that.lawName = val[0].label
+				that.form.break_id = val[0].value
+			},
+			confirmType(val) {
+				console.log(val)
+				var that = this
+				this.$refs.uForm.resetFields();
+				that.typeName = val[0].label
+				that.instype = val[0].value
+				that.formshow = true
+				that.filesList = [];
+				this.$refs.uUpload.clear();
+				that.dealFilesList = [];
+				if (that.form.is_scene == 1) {
+					this.$refs.uUploaddeal.clear();
+				}
+				that.form.is_unusual = 0
+				that.form.is_scene = 0
+				that.form.is_law = 0
+				if (val[0].value == 2) {
+					that.formshow = false
+					that.lawshow = false
+				}
+				console.log("res", that.form)
+			},
+			chooseLocation(e) { //打开地图选择位置
+				var that = this;
+				uni.chooseLocation({
+					longitude: that.form.longitude,
+					latitude: that.form.latitude,
+					success: res => {
+						that.form.address = res.name;
+						that.form.longitude = res.longitude;
+						that.form.latitude = res.latitude;
+					}
+				});
+			},
+			toremove(index, lists, name, whatfile) {
+				if (whatfile == "filesList") {
+					this.filesList.splice(index, 1)
+					// this.form.files_list = list;
+				}
+				if (whatfile == "dealFilesList") {
+					this.dealFilesList.splice(index, 1)
+					// this.form.deal_files_list = list;
+				}
+			},
+			onprogress(res) {
+				uni.showToast({
+					icon: "none",
+					title: "上传中",
+					duration: 2000
+				})
+			},
+			tosuccess() {
+				uni.showToast({
+					icon: "none",
+					title: "上传成功",
+					duration: 2000
+				})
+			},
+			toupload(lists, name, whatfile) {
+				var that = this;
+				let list = [];
+				if (whatfile == "filesList") {
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if (whatfile == "dealFilesList") {
+					that.dealFilesList = lists;
+
+				}
+			},
+			afterSubmit(res) {
+				uni.redirectTo({
+					url: "../raininspectionlist/raininspectionList"
+				})
+			},
+			loadBuildType() {
+				var that = this;
+				that.util.request({
+					api: '/api/admin/parameter/show',
+					method: "get",
+					data: {
+						number: "siteType"
+					},
+					utilSuccess: function(result) {
+						that.rainArr.buildTypes = result.detail
+
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			loadBuild() {
+				var that = this;
+				that.util.request({
+					api: '/api/mobile/rain-inspection/all-building-site',
+					method: "get",
+					data: {
+						keyword: that.buildName
+					},
+					utilSuccess: function(result) {
+						// that.rainArr.buildList = result
+						let arr = [];
+						if (result.length > 0) {
+							for (var m of result) {
+								m.extra = m
+								arr.push(m)
+							}
+							that.confirmText = "确认"
+						} else {
+							arr.push({
+								name: that.buildName
+							})
+							that.confirmText = "新增"
+						}
+
+						that.rainArr.buildList = arr
+						that.buildShow = true
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			loadLawTypes() {
+				var that = this;
+				that.util.request({
+					api: '/api/admin/parameter/show',
+					method: "get",
+					data: {
+						number: "siteLaw"
+					},
+					utilSuccess: function(result) {
+						that.rainArr.lawTypes = result.detail
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+			loadAskContent() {
+				var that = this;
+				that.util.request({
+					api: '/api/admin/parameter/show',
+					method: "get",
+					data: {
+						number: "equiementList"
+					},
+					utilSuccess: function(result) {
+						that.rainArr.askContentList = result.detail
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+
+			showInfo(id) {
+				var that = this;
+				that.util.request({
+					api: '/api/mobile/rain-inspection/show',
+					method: "get",
+					data: {
+						id: id
+					},
+					utilSuccess: function(result) {
+
+						switch (result.type) {
+							case 1:
+								that.typeName = "日常雨水设施"
+								that.instype = 1
+								that.form = result.rain_equipment_info;
+								that.form.rain_equipment_id = result.rain_equipment_id;
+								that.askName = result.rain_equipment_info.ask_content_detail.value
+								that.roadName = result.rain_equipment_info.road ? result.rain_equipment_info
+									.road.name : ""
+								let _files = [];
+								for (var mod of result.rain_equipment_info.rain_equipment_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "before";
+									_files.push(m);
+								}
+								that.filesList = _files;
+
+								let _filesafter = [];
+								for (var mod of result.rain_equipment_info.rain_equipment_end_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "after";
+									_filesafter.push(m);
+								}
+								that.dealFilesList = _filesafter;
+								console.log(that.form)
+								break;
+							case 2:
+								that.typeName = "在建工地"
+								that.formshow = false
+								that.instype = 2
+								that.form = result.building_site_info;
+								that.form.building_site_content_id = result.building_site_content_id;
+								that.buildName = result.building_site_info.building_site.name
+								that.form.building_site_id = result.building_site_info.building_site.id
+								that.form.name = result.building_site_info.building_site.name
+								that.form.number = result.building_site_info.building_site.number
+								that.form.type = result.building_site_info.building_site.type
+								that.form.status = result.building_site_info.building_site.status
+								that.form.remark = result.building_site_info.building_site.remark
+								that.form.latitude = result.building_site_info.building_site.latitude;
+								that.form.longitude = result.building_site_info.building_site.longitude;
+								that.form.address = result.building_site_info.building_site.address;
+								that.roadName = result.building_site_info.road ? result.building_site_info.road
+									.name : ""
+								for (var m of that.rainArr.buildTypes) {
+									if (result.building_site_info.building_site.type == m.id) {
+										that.buildtypeName = m.value;
+									}
+								}
+								for (var m of that.rainArr.lawTypes) {
+									if (result.building_site_info.break_id == m.id) {
+										that.lawName = m.value;
+									}
+								}
+								let discharge_files = [];
+								for (var mod of result.building_site_info.building_site_content_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "before";
+									discharge_files.push(m);
+								}
+								that.filesList = discharge_files;
+
+								// that.form.type = result.type
+								break;
+						}
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+
+			submit() {
+				var that = this;
+				let list = [];
+				let deallist = [];
+				for (var mod of that.filesList) {
+					if (mod.response) {
+						list.push({
+							upload_id: mod.response.id
+						})
+					} else {
+						list.push({
+							upload_id: mod.id
+						})
+					}
+				}
+				for (var mod of that.dealFilesList) {
+					if (mod.response) {
+						deallist.push({
+							upload_id: mod.response.id
+						})
+					} else {
+						deallist.push({
+							upload_id: mod.id
+						})
+					}
+				}
+				that.form.files_list = list;
+				that.form.files_end_list = deallist;
+				let api = "";
+				if (this.infoId) {
+					api = this.apis.save[this.instype]
+				} else {
+					api = this.apis.store[this.instype]
+				}
+
+				this.$refs.uForm.validate(valid => {
+					console.log(api)
+					console.log("form", that.form)
+					// return
+					if (valid) {
+						console.log('验证通过');
+						// if(that.infoId){
+						that.util.request({
+							api: api,
+							method: "POST",
+							data: that.form,
+							utilSuccess: function(res) {
+								uni.showToast({
+									icon: "none",
+									title: "提交成功",
+									complete() {
+										that.afterSubmit(res);
+									},
+									duration: 2000
+								})
+							},
+							utilFail: function(res) {
+								that.util.alert(res);
+							}
+						});
+						// }else{
+						// 	that.util.request({
+						// 		api: api,
+						// 		method: "POST",
+						// 		data: that.form,
+						// 		utilSuccess: function(res) {
+						// 			uni.showToast({
+						// 				icon: "none",
+						// 				title: "提交成功",
+						// 				complete() {
+						// 					that.afterSubmit(res);
+						// 				},
+						// 				duration: 2000
+						// 			})
+						// 		},
+						// 		utilFail: function(res) {
+						// 			that.util.alert(res);
+						// 		}
+						// 	});
+						// }
+
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 20rpx;
+	}
+
+	.popuptitle {
+		background: #0385e5;
+		color: #fff;
+		padding: 20rpx 30rpx;
+	}
 </style>
diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue
index 3d41b72..9f88e8a 100644
--- a/rainmaintain/rainmaintain/rainmaintain.vue
+++ b/rainmaintain/rainmaintain/rainmaintain.vue
@@ -1,518 +1,536 @@
-<template>
-	<view class="content">
-		<view>
-			所属道路：{{roadName}}
-		</view>
-		<u-form :model="form" ref="uForm">
-			<u-form-item v-if='!showInfoId' label="养护类型" label-position="top" prop="type" required>
-				<u-input placeholder="请选择养护类型" v-model="typeName" type="select" :border="true" @click="typeShow = true" />
-				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
-				<u-select v-model="typeShow" mode="single-column" value-name="id" label-name="name" :list="rainArr.rainTypes"
-					@confirm="confirmType"></u-select>
-			</u-form-item>
-			<u-form-item v-if='showInfoId' label="养护类型" label-position="top" prop="type" required>
-				<view>
-					{{typeName}}
-				</view>
-			</u-form-item>
-				
-			<u-form-item v-if="formshow" label="位置" label-position="top" required>
-				<!-- <text>{{form.address}}</text> -->
-				<u-input v-model="form.address" disabled type='text'/>
-				<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取</u-button>
-			</u-form-item>
-				<u-form-item v-if="!formshow" label="外运时间" label-position="top" prop="type">
-					<u-input placeholder="请选择外运时间" v-model="form.date" type="select" :border="true" @click="dateShow = true" />
-					<u-picker
-						mode="time"
-						v-model="dateShow"
-						:params="dateparams"
-						@confirm="confirmDate"
-					></u-picker>
-				</u-form-item>
-				<u-form-item v-if="!formshow" label-position="top" label="备用排放点" prop="address">
-					<u-input v-model="form.address" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				
-			<u-form-item label-position="top" label="描述" prop="content" required>
-				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
-			</u-form-item>
-			<u-form-item label-position="top" label="现场照片">
-				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
-					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
-					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
-				</u-upload>
-			</u-form-item>
-			
-			<view v-if="formshow">
-				<u-form-item labelWidth="130" label-position="left" label="是否解决">
-					<u-radio-group v-model="form.is_solve">
-						<u-radio 
-							v-for="(item, index) in rainArr.solves" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item v-if="lawshow" labelWidth="130" label-position="left" label="是否违法">
-					<u-radio-group v-model="form.is_law">
-						<u-radio 
-							v-for="(item, index) in rainArr.laws" :key="index" 
-							:name="item.id"
-						>
-							{{item.name}}
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item label-position="top" label="临时处理办法" prop="deal_content">
-					<u-input v-model="form.deal_content" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				<u-form-item v-if="form.is_solve == 1" label-position="top" label="处理结果" prop="deal_result">
-					<u-input v-model="form.deal_result" type='textarea' height='100' :border="true" />
-				</u-form-item>
-				<u-form-item  v-if="form.is_solve == 1" label-position="top" label="处理后照片">
-					<u-upload ref="uUploaddeal" multiple :maxCount="10" :action="action" upload-text="选择附件"
-						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="dealFilesList" :form-data="otherData" :show-tips="false" @on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
-						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
-					</u-upload>
-				</u-form-item>
-			</view>
-		</u-form>
-		<u-button type="primary" @click="submit">提交</u-button>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				otherData: {
-					token: ""
-				},
-				roadName:"",
-				typeShow:false,
-				dateShow:false,
-				formshow:true,
-				lawshow:true,
-				showInfoId:false,
-				typeName:"雨水管道疏挖",
-				dateparams: {
-					year: true,
-					month: true,
-					day: true,
-					hour:true,
-					minute:true,
-					second:true,
-				},
-				rainArr:{
-					rainTypes:[
-						{
-							id:1,
-							name:"雨水管道疏挖"
-						},
-						{
-							id:2,
-							name:"雨水管道疏通"
-						},
-						{
-							id:3,
-							name:"汛期助排"
-						},
-						{
-							id:4,
-							name:"污泥外运"
-						}
-					],
-					solves:[
-						{
-							id:0,
-							name:"否"
-						},
-						{
-							id:1,
-							name:"是"
-						}
-					],
-					laws:[
-						{
-							id:0,
-							name:"否"
-						},
-						{
-							id:1,
-							name:"是"
-						}
-					]
-				},
-				filesList:[],
-				dealFilesList:[],
-				form:{
-					road_id:"",
-					type:1,
-					content:"",
-					is_solve:0,
-					is_law:0,
-					deal_content:"",
-					deal_result:"",
-					address:"",
-					longitude:"",
-					latitude:"",
-					files_list:[],
-					files_deal_list:[],
-					date:"",
-					address:"",
-				},
-				rules:{
-					content: [{
-						required: true,
-						message: '请填写描述',
-						// 可以单个或者同时写两个触发验证方式 
-						trigger: ['blur'],
-					}]
-				},
-				apis:{
-					store:[
-						"",
-						"/api/mobile/rain-maintains/circulation-store",
-						"/api/mobile/rain-maintains/circulation-store",
-						"/api/mobile/rain-maintains/help-discharge-store",
-						"/api/mobile/rain-maintains/mire-store"
-					],
-					save:[
-						"",
-						"/api/mobile/rain-maintains/circulation-save",
-						"/api/mobile/rain-maintains/circulation-save",
-						"/api/mobile/rain-maintains/help-discharge-save",
-						"/api/mobile/rain-maintains/mire-save"
-					]
-				}
-			}
-		},
-		onLoad(options) {
-			var that = this;
-			if(options.id){
-				this.infoId = options.id;
-				this.showInfoId = true
-				this.showInfo(this.infoId);
-			}
-			if(options.roadid){
-				this.form.road_id = options.roadid
-				this.roadName = options.roadname
-			}
-			
-			
-			this.action = this.util.HOST + "/api/mobile/upload-file";
-			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
-		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
-			let that = this;
-			uni.getLocation({
-				type: "gcj02",
-				geocode:true,
-				success(res) {
-					that.form.latitude = res.latitude;
-					that.form.longitude = res.longitude;
-					const url = "https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location="+res.latitude+","+res.longitude+"&output=jsonp"
-					that.$jsonp(
-							url
-					 ).then(re => {
-						that.form.address = re.result.formatted_addresses.recommend
-					})
-				}
-				
-			})
-			uni.getSystemInfo({
-				complete(res) {
-					that.width = res.screenWidth * .8
-					that.height = res.screenHeight * .6
-				}
-			})
-		
-		},
-		methods: {
-			confirmType(val){
-				console.log(val)
-				var that = this
-				this.$refs.uForm.resetFields();
-				that.typeName = val[0].label
-				that.form.type = val[0].value
-				that.formshow = true
-				that.lawshow = true
-				that.filesList = [];
-				this.$refs.uUpload.clear();
-				that.dealFilesList = [];
-				if(that.form.is_solve==1){
-					this.$refs.uUploaddeal.clear();
-				}
-				that.form.is_law = 0
-				that.form.is_solve = 0
-				if(val[0].value==4){
-					that.formshow = false
-					that.form.address = ""
-					that.form.latitude = ""
-					that.form.longitude = ""
-				}
-				if(val[0].value==3||val[0].value==4){
-					that.lawshow = false
-				}
-				console.log("res",that.form)
-			},
-			chooseLocation(e) { //打开地图选择位置
-				var that = this;
-				uni.chooseLocation({
-					longitude : that.form.longitude,
-					latitude : that.form.latitude,
-					success: res => {
-						that.form.address = res.name;
-						that.form.longitude = res.longitude;
-						that.form.latitude = res.latitude;
-					}
-				});
-			},
-			confirmDate(val){
-				this.form.date = val.year+"-"+val.month+"-"+val.day+" "+val.hour+":"+val.minute+":"+val.second
-			},
-			toremove(index, lists, name,whatfile) {
-				if(whatfile=="filesList"){
-					this.filesList.splice(index,1)
-					// this.form.files_list = list;
-				}
-				if(whatfile=="dealFilesList"){
-					this.dealFilesList.splice(index,1)
-					// this.form.deal_files_list = list;
-				}
-			},
-			onprogress(res){
-				uni.showToast({
-					icon: "none",
-					title: "上传中",
-					duration: 2000
-				})
-			},
-			tosuccess(){
-				uni.showToast({
-					icon: "none",
-					title: "上传成功",
-					duration: 2000
-				})
-			},
-			toupload(lists, name, whatfile) {
-				var that = this;
-				let list = [];
-				if(whatfile=="filesList"){
-					that.filesList = lists
-					// this.form.files_list = list;
-				}
-				if(whatfile=="dealFilesList"){
-					that.dealFilesList = lists;
-					
-				}
-			},
-			afterSubmit(res) {
-				uni.redirectTo({
-					url: "../rainmaintainlist/rainmaintainList"
-				})
-			},
-			
-			showInfo(id){
-				var that = this;
-				that.util.request({
-					api: '/api/mobile/rain-maintains/show',
-					method: "get",
-					data: {
-						id:id
-					},
-					utilSuccess: function(result) {
-						
-						switch(result.type){
-						  case 1:
-						  case 2:
-							if(result.type==1){
-								that.typeName = "雨水管道疏挖"
-							}else if(result.type==2){
-								that.typeName = "雨水管道疏通"
-							}
-							 
-						    that.form = result.circulation_info;
-						    that.form.circulation_id = result.circulation_id;
-							that.roadName = result.circulation_info.road.name
-						    let _files = [];
-						    for (var mod of result.circulation_info.circulation_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "before";
-						      _files.push(m);
-						    }
-						    that.filesList = _files;
-						
-						    let _filesafter = [];
-						    for (var mod of result.circulation_info.circulation_deal_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "after";
-						      _filesafter.push(m);
-						    }
-						    that.dealFilesList = _filesafter;
-							that.form.type = result.type
-							console.log(that.form)
-						    break;
-						  case 3:
-							that.typeName = "汛期助排"
-							that.lawshow = false
-						    that.form = result.help_discharge_info;
-						    that.form.help_discharge_id = result.help_discharge_id;
-							that.roadName = result.help_discharge_info.road.name
-						    let discharge_files = [];
-						    for (var mod of result.help_discharge_info.help_discharge_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "before";
-						      discharge_files.push(m);
-						    }
-						    that.filesList = discharge_files;
-						
-						    let discharge_filesafter = [];
-						    for (var mod of result.help_discharge_info.help_discharge_deal_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "after";
-						      discharge_filesafter.push(m);
-						    }
-						    that.dealFilesList = discharge_filesafter;
-							that.form.type = result.type
-						    break;
-						  case 4:
-							that.typeName = "污泥外运"
-							that.formshow = false
-						    that.form = result.mire_info;
-						    that.form.mire_id = result.mire_id;
-							that.roadName = result.mire_info.road.name
-						    let mire_files = [];
-						    for (var mod of result.mire_info.mire_files) {
-						      let m = Object.assign({}, mod);
-						      m.url = mod.files.url;
-						      m.id = mod.files.id;
-						      m.photoType = "before";
-						      mire_files.push(m);
-						    }
-						    that.filesList =mire_files;
-							that.form.type = result.type
-						    break;
-						}
-					},
-					utilFail: function(res) {
-						that.util.alert(res);
-					}
-				});
-			},
-			
-			submit(){
-				var that = this;
-				let list = [];
-				let deallist=[];
-				for(var mod of that.filesList){
-					if( mod.response){
-						list.push({
-							upload_id: mod.response.id
-						})
-					}else{
-						list.push({
-							upload_id:mod.id
-						})
-					}
-				}
-				for(var mod of that.dealFilesList){
-					if( mod.response){
-						deallist.push({
-							upload_id: mod.response.id
-						})
-					}else{
-						deallist.push({
-							upload_id: mod.id
-						})
-					}
-				}
-				that.form.files_list = list;
-				that.form.files_deal_list = deallist;
-				console.log(this.form);
-				let api = "";
-				if(this.infoId){
-					api = this.apis.save[this.form.type]
-				}else{
-					api = this.apis.store[this.form.type]
-				}
-
-				this.$refs.uForm.validate(valid => {
-					// console.log(api)
-					// return;
-					if (valid) {
-						console.log('验证通过');
-						// if(that.infoId){
-							that.util.request({
-								api: api,
-								method: "POST",
-								data: that.form,
-								utilSuccess: function(res) {
-									uni.showToast({
-										icon: "none",
-										title: "提交成功",
-										complete() {
-											that.afterSubmit(res);
-										},
-										duration: 2000
-									})
-								},
-								utilFail: function(res) {
-									that.util.alert(res);
-								}
-							});
-						// }else{
-						// 	that.util.request({
-						// 		api: api,
-						// 		method: "POST",
-						// 		data: that.form,
-						// 		utilSuccess: function(res) {
-						// 			uni.showToast({
-						// 				icon: "none",
-						// 				title: "提交成功",
-						// 				complete() {
-						// 					that.afterSubmit(res);
-						// 				},
-						// 				duration: 2000
-						// 			})
-						// 		},
-						// 		utilFail: function(res) {
-						// 			that.util.alert(res);
-						// 		}
-						// 	});
-						// }
-						
-					} else {
-						console.log('验证失败');
-					}
-				});
-			},
-			
-			
-		}
-	}
-</script>
-
-<style>
-	.content {
-		padding: 20rpx;
-	}
-
-	.popuptitle {
-		background: #0385e5;
-		color: #fff;
-		padding: 20rpx 30rpx;
-	}
+<template>
+	<view class="content">
+		<view>
+			所属道路：{{roadName}}
+		</view>
+		<u-form :model="form" ref="uForm">
+			<u-form-item v-if='!showInfoId' label="养护类型" label-position="top" prop="type" required>
+				<u-input placeholder="请选择养护类型" v-model="typeName" type="select" :border="true"
+					@click="typeShow = true" />
+				<!-- <u-picker :show="typeShow" keyName="name" :columns="rainArr.rainTypes" @confirm="confirmType"></u-picker> -->
+				<u-select v-model="typeShow" mode="single-column" value-name="id" label-name="name"
+					:list="rainArr.rainTypes" @confirm="confirmType"></u-select>
+			</u-form-item>
+			<u-form-item v-if='showInfoId' label="养护类型" label-position="top" prop="type" required>
+				<view>
+					{{typeName}}
+				</view>
+			</u-form-item>
+
+			<block v-if="formshow">
+				<u-form-item label="养护内容" label-position="top" prop="type" required>
+					<u-input placeholder="请选择养护内容" v-model="askName" type="select" :border="true"
+						@click="askShow = true" />
+					<u-select v-model="askShow" mode="single-column" value-name="id" label-name="value"
+						:list="rainArr.askContentList" @confirm="confirmAskType"></u-select>
+				</u-form-item>
+				<u-form-item label="位置" label-position="top" required>
+					<u-input v-model="form.address" disabled type='text' />
+					<u-button shape="square" slot='right' size="mini" @click="chooseLocation" type="info">重新获取
+					</u-button>
+				</u-form-item>
+			</block>
+			<block v-if="!formshow">
+				<u-form-item label="外运时间" label-position="top" prop="type">
+					<u-input placeholder="请选择外运时间" v-model="form.date" type="select" :border="true"
+						@click="dateShow = true" />
+					<u-picker mode="time" v-model="dateShow" :params="dateparams" @confirm="confirmDate"></u-picker>
+				</u-form-item>
+				<u-form-item label-position="top" label="备用排放点" prop="address">
+					<u-input v-model="form.address" type='textarea' height='100' :border="true" />
+				</u-form-item>
+			</block>
+			<u-form-item label-position="top" label="描述" prop="content" required>
+				<u-input v-model="form.content" type='textarea' height='100' :border="true" />
+			</u-form-item>
+			<u-form-item label-position="top" label="现场照片">
+				<u-upload ref="uUpload" multiple :maxCount="10" :action="action" upload-text="选择附件"
+					:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess" :file-list="filesList"
+					:form-data="otherData" :show-tips="false"
+					@on-uploaded="function(lists, name) {return toupload(lists, name,'filesList')}"
+					@on-remove="function(index, lists, name) {return toremove(index, lists, name,'filesList')}">
+				</u-upload>
+			</u-form-item>
+
+			<view v-if="formshow">
+				<u-form-item labelWidth="130" label-position="left" label="是否解决">
+					<u-radio-group v-model="form.is_solve">
+						<u-radio v-for="(item, index) in rainArr.solves" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item v-if="lawshow" labelWidth="130" label-position="left" label="是否违法">
+					<u-radio-group v-model="form.is_law">
+						<u-radio v-for="(item, index) in rainArr.laws" :key="index" :name="item.id">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item label-position="top" label="临时处理办法" prop="deal_content">
+					<u-input v-model="form.deal_content" type='textarea' height='100' :border="true" />
+				</u-form-item>
+				<u-form-item v-if="form.is_solve == 1" label-position="top" label="处理结果" prop="deal_result">
+					<u-input v-model="form.deal_result" type='textarea' height='100' :border="true" />
+				</u-form-item>
+				<u-form-item v-if="form.is_solve == 1" label-position="top" label="处理后照片">
+					<u-upload ref="uUploaddeal" multiple :maxCount="10" :action="action" upload-text="选择附件"
+						:previewFullImage="true" @on-progress="onprogress" @on-success="tosuccess"
+						:file-list="dealFilesList" :form-data="otherData" :show-tips="false"
+						@on-uploaded="function(lists, name) {return toupload(lists, name,'dealFilesList')}"
+						@on-remove="function(index, lists, name) {return toremove(index, lists, name,'dealFilesList')}">
+					</u-upload>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-button type="primary" @click="submit">提交</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				otherData: {
+					token: ""
+				},
+				roadName: "",
+				typeShow: false,
+				dateShow: false,
+				formshow: true,
+				lawshow: true,
+				showInfoId: false,
+				typeName: "雨水管道疏挖",
+				dateparams: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true,
+				},
+				rainArr: {
+					rainTypes: [{
+							id: 1,
+							name: "雨水管道疏挖"
+						},
+						{
+							id: 2,
+							name: "雨水管道疏通"
+						},
+						{
+							id: 3,
+							name: "汛期助排"
+						},
+						{
+							id: 4,
+							name: "污泥外运"
+						},
+						{
+							id: 5,
+							name: "出水口排查"
+						}
+					],
+					solves: [{
+							id: 0,
+							name: "否"
+						},
+						{
+							id: 1,
+							name: "是"
+						}
+					],
+					laws: [{
+							id: 0,
+							name: "否"
+						},
+						{
+							id: 1,
+							name: "是"
+						}
+					]
+				},
+				filesList: [],
+				dealFilesList: [],
+				form: {
+					road_id: "",
+					type: 1,
+					content: "",
+					is_solve: 0,
+					is_law: 0,
+					deal_content: "",
+					deal_result: "",
+					address: "",
+					longitude: "",
+					latitude: "",
+					files_list: [],
+					files_deal_list: [],
+					date: "",
+					address: "",
+				},
+				rules: {
+					content: [{
+						required: true,
+						message: '请填写描述',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['blur'],
+					}]
+				},
+				apis: {
+					store: [
+						"",
+						"/api/mobile/rain-maintains/circulation-store",
+						"/api/mobile/rain-maintains/circulation-store",
+						"/api/mobile/rain-maintains/help-discharge-store",
+						"/api/mobile/rain-maintains/mire-store"
+					],
+					save: [
+						"",
+						"/api/mobile/rain-maintains/circulation-save",
+						"/api/mobile/rain-maintains/circulation-save",
+						"/api/mobile/rain-maintains/help-discharge-save",
+						"/api/mobile/rain-maintains/mire-save"
+					]
+				}
+			}
+		},
+		onLoad(options) {
+			var that = this;
+			if (options.id) {
+				this.infoId = options.id;
+				this.showInfoId = true
+				this.showInfo(this.infoId);
+			}
+			if (options.roadid) {
+				this.form.road_id = options.roadid
+				this.roadName = options.roadname
+			}
+
+
+			this.action = this.util.HOST + "/api/mobile/upload-file";
+			this.otherData.token = uni.getStorageSync("userInfo_token").access_token;
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+			let that = this;
+			uni.getLocation({
+				type: "gcj02",
+				geocode: true,
+				success(res) {
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android) != undefined && typeof(window.android) != "undefined") {
+						loc = window.android.getLocInfo();
+					}
+					if (loc) {
+						that.form.latitude = JSON.parse(loc).lat;
+						that.form.longitude = JSON.parse(loc).lon;
+					} else {
+						that.form.latitude = res.latitude;
+						that.form.longitude = res.longitude;
+					}
+					const url =
+						"https://apis.map.qq.com/ws/geocoder/v1/?key=EUQBZ-MJALU-WZFVR-2HFNW-TIK2K-TNBJI&location=" +
+						that.form.latitude + "," + that.form.longitude + "&output=jsonp"
+					that.$jsonp(
+						url
+					).then(re => {
+						that.form.address = re.result.formatted_addresses.recommend
+					})
+				}
+
+			})
+			uni.getSystemInfo({
+				complete(res) {
+					that.width = res.screenWidth * .8
+					that.height = res.screenHeight * .6
+				}
+			})
+
+		},
+		methods: {
+			confirmType(val) {
+				console.log(val)
+				var that = this
+				this.$refs.uForm.resetFields();
+				that.typeName = val[0].label
+				that.form.type = val[0].value
+				that.formshow = true
+				that.lawshow = true
+				that.filesList = [];
+				this.$refs.uUpload.clear();
+				that.dealFilesList = [];
+				if (that.form.is_solve == 1) {
+					this.$refs.uUploaddeal.clear();
+				}
+				that.form.is_law = 0
+				that.form.is_solve = 0
+				if (val[0].value == 4) {
+					that.formshow = false
+					that.form.address = ""
+					that.form.latitude = ""
+					that.form.longitude = ""
+				}
+				if (val[0].value == 3 || val[0].value == 4) {
+					that.lawshow = false
+				}
+				console.log("res", that.form)
+			},
+			chooseLocation(e) { //打开地图选择位置
+				var that = this;
+				uni.chooseLocation({
+					longitude: that.form.longitude,
+					latitude: that.form.latitude,
+					success: res => {
+						that.form.address = res.name;
+						that.form.longitude = res.longitude;
+						that.form.latitude = res.latitude;
+					}
+				});
+			},
+			confirmDate(val) {
+				this.form.date = val.year + "-" + val.month + "-" + val.day + " " + val.hour + ":" + val.minute + ":" + val
+					.second
+			},
+			toremove(index, lists, name, whatfile) {
+				if (whatfile == "filesList") {
+					this.filesList.splice(index, 1)
+					// this.form.files_list = list;
+				}
+				if (whatfile == "dealFilesList") {
+					this.dealFilesList.splice(index, 1)
+					// this.form.deal_files_list = list;
+				}
+			},
+			onprogress(res) {
+				uni.showToast({
+					icon: "none",
+					title: "上传中",
+					duration: 2000
+				})
+			},
+			tosuccess() {
+				uni.showToast({
+					icon: "none",
+					title: "上传成功",
+					duration: 2000
+				})
+			},
+			toupload(lists, name, whatfile) {
+				var that = this;
+				let list = [];
+				if (whatfile == "filesList") {
+					that.filesList = lists
+					// this.form.files_list = list;
+				}
+				if (whatfile == "dealFilesList") {
+					that.dealFilesList = lists;
+
+				}
+			},
+			afterSubmit(res) {
+				uni.redirectTo({
+					url: "../rainmaintainlist/rainmaintainList"
+				})
+			},
+
+			showInfo(id) {
+				var that = this;
+				that.util.request({
+					api: '/api/mobile/rain-maintains/show',
+					method: "get",
+					data: {
+						id: id
+					},
+					utilSuccess: function(result) {
+
+						switch (result.type) {
+							case 1:
+							case 2:
+								if (result.type == 1) {
+									that.typeName = "雨水管道疏挖"
+								} else if (result.type == 2) {
+									that.typeName = "雨水管道疏通"
+								}
+
+								that.form = result.circulation_info;
+								that.form.circulation_id = result.circulation_id;
+								that.roadName = result.circulation_info.road.name
+								let _files = [];
+								for (var mod of result.circulation_info.circulation_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "before";
+									_files.push(m);
+								}
+								that.filesList = _files;
+
+								let _filesafter = [];
+								for (var mod of result.circulation_info.circulation_deal_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "after";
+									_filesafter.push(m);
+								}
+								that.dealFilesList = _filesafter;
+								that.form.type = result.type
+								console.log(that.form)
+								break;
+							case 3:
+								that.typeName = "汛期助排"
+								that.lawshow = false
+								that.form = result.help_discharge_info;
+								that.form.help_discharge_id = result.help_discharge_id;
+								that.roadName = result.help_discharge_info.road.name
+								let discharge_files = [];
+								for (var mod of result.help_discharge_info.help_discharge_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "before";
+									discharge_files.push(m);
+								}
+								that.filesList = discharge_files;
+
+								let discharge_filesafter = [];
+								for (var mod of result.help_discharge_info.help_discharge_deal_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "after";
+									discharge_filesafter.push(m);
+								}
+								that.dealFilesList = discharge_filesafter;
+								that.form.type = result.type
+								break;
+							case 4:
+								that.typeName = "污泥外运"
+								that.formshow = false
+								that.form = result.mire_info;
+								that.form.mire_id = result.mire_id;
+								that.roadName = result.mire_info.road.name
+								let mire_files = [];
+								for (var mod of result.mire_info.mire_files) {
+									let m = Object.assign({}, mod);
+									m.url = mod.files.url;
+									m.id = mod.files.id;
+									m.photoType = "before";
+									mire_files.push(m);
+								}
+								that.filesList = mire_files;
+								that.form.type = result.type
+								break;
+						}
+					},
+					utilFail: function(res) {
+						that.util.alert(res);
+					}
+				});
+			},
+
+			submit() {
+				var that = this;
+				let list = [];
+				let deallist = [];
+				for (var mod of that.filesList) {
+					if (mod.response) {
+						list.push({
+							upload_id: mod.response.id
+						})
+					} else {
+						list.push({
+							upload_id: mod.id
+						})
+					}
+				}
+				for (var mod of that.dealFilesList) {
+					if (mod.response) {
+						deallist.push({
+							upload_id: mod.response.id
+						})
+					} else {
+						deallist.push({
+							upload_id: mod.id
+						})
+					}
+				}
+				that.form.files_list = list;
+				that.form.files_deal_list = deallist;
+				console.log(this.form);
+				let api = "";
+				if (this.infoId) {
+					api = this.apis.save[this.form.type]
+				} else {
+					api = this.apis.store[this.form.type]
+				}
+
+				this.$refs.uForm.validate(valid => {
+					// console.log(api)
+					// return;
+					if (valid) {
+						console.log('验证通过');
+						// if(that.infoId){
+						that.util.request({
+							api: api,
+							method: "POST",
+							data: that.form,
+							utilSuccess: function(res) {
+								uni.showToast({
+									icon: "none",
+									title: "提交成功",
+									complete() {
+										that.afterSubmit(res);
+									},
+									duration: 2000
+								})
+							},
+							utilFail: function(res) {
+								that.util.alert(res);
+							}
+						});
+						// }else{
+						// 	that.util.request({
+						// 		api: api,
+						// 		method: "POST",
+						// 		data: that.form,
+						// 		utilSuccess: function(res) {
+						// 			uni.showToast({
+						// 				icon: "none",
+						// 				title: "提交成功",
+						// 				complete() {
+						// 					that.afterSubmit(res);
+						// 				},
+						// 				duration: 2000
+						// 			})
+						// 		},
+						// 		utilFail: function(res) {
+						// 			that.util.alert(res);
+						// 		}
+						// 	});
+						// }
+
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 20rpx;
+	}
+
+	.popuptitle {
+		background: #0385e5;
+		color: #fff;
+		padding: 20rpx 30rpx;
+	}
 </style>
diff --git a/road/road/road.vue b/road/road/road.vue
index 27d8a66..f862281 100644
--- a/road/road/road.vue
+++ b/road/road/road.vue
@@ -4,8 +4,8 @@
 		<view class="box-header">
 			<view class="search-wrap">
 				<!-- 如果使用u-search组件，必须要给v-model绑定一个变量 -->
-				<u-search v-model="keyword" placeholder="请输入关键词查看更多道路信息" @search="tosearch()" @custom="tosearch()" height="56"
-					:action-style="{color: '#fff'}">
+				<u-search v-model="keyword" placeholder="请输入关键词查看更多道路信息" @search="tosearch()" @custom="tosearch()"
+					height="56" :action-style="{color: '#fff'}">
 				</u-search>
 			</view>
 
@@ -15,10 +15,10 @@
 			<u-radio-group :wrap="true">
 				<u-radio @change="radioChange" v-for="(item, index) in dataList" :key="index"
 					:name="item.id+','+item.name">
-					<div style="display: flex;justify-content: space-between;width: 600rpx;">
-							<text>{{item.name}}</text>
-						<text>距离{{item.distance}}公里</text>
-						</div>
+					<div style="display: flex;justify-content: space-between;width: 600rpx;">
+						<text>{{item.name}}</text>
+						<text>距离{{item.distance}}公里</text>
+					</div>
 				</u-radio>
 			</u-radio-group>
 			<u-loadmore class="loadmore" :status="loadStatus" :load-text="loadText" />
@@ -76,13 +76,23 @@
 		},
 		onLoad(options) {
 			let that = this;
-			that.totype = options.type
+			that.totype = options.type;
 			uni.getLocation({
 				type: "gcj02",
 				geocode: true,
 				success(res) {
-					that.latitude = res.latitude;
-					that.longitude = res.longitude;
+					var loc = null
+					console.log(typeof(window.android))
+					if (typeof(window.android)!=undefined&&typeof(window.android)!="undefined") {
+						loc = window.android.getLocInfo();
+					}
+					if (loc) {
+						that.latitude = JSON.parse(loc).lat;
+						that.longitude = JSON.parse(loc).lon;
+					} else {
+						that.latitude = res.latitude;
+						that.longitude = res.longitude;
+					}
 					that.loadPage(1);
 				}
 			})
diff --git a/utils/util.js b/utils/util.js
index bde3e54..c22eb02 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,7 +1,7 @@
 import md5 from "./md5.min";
 const HOSTARR = {
+	'development': 'http://192.168.60.100:9001',
 	//'development': 'http://patrol.115.langye.net',
-	'development': 'http://patrol.115.langye.net',
 	'production': 'http://192.168.60.100:9001'
 }; // 审核状态