From 1e71dd86f6d0c4fc7e5143600d4bc4b50992a2a7 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 04 Jul 2024 14:51:28 +0800
Subject: [PATCH] fix: 高德密钥修改

---
 pages/actionChange/newPage/index.vue |   87 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/pages/actionChange/newPage/index.vue b/pages/actionChange/newPage/index.vue
index 6c34083..1f53fb0 100644
--- a/pages/actionChange/newPage/index.vue
+++ b/pages/actionChange/newPage/index.vue
@@ -10,11 +10,18 @@
 					@confirm="checkTime" @cancel='showeEscalationTime=false' />
 			</u-form-item>
 			<u-form-item border-bottom label="������������:" prop="pollutePosition" required>
-				<u-input v-model="form.pollutePosition" border="none" placeholder="���������" type="text">
+				<view style="display: flex;align-items: center;">
+					<u--textarea v-model="form.pollutePosition" border="none" placeholder="���������"
+						autoHeight></u--textarea>
+					<view style="width: 60px;">
+						<u-button @tap="authVerification()" text="������������" type="success" size="mini"></u-button>
+					</view>
+				</view>
+				<!-- <u-input v-model="form.pollutePosition" border="none" placeholder="���������" type="text">
 					<template slot="suffix">
 						<u-button @tap="authVerification()" text="������������" type="success" size="mini"></u-button>
 					</template>
-				</u-input>
+				</u-input> -->
 			</u-form-item>
 			<u-form-item border-bottom label="������������:" prop="unitId" required @click="
 					showCheckBox = true;
@@ -88,6 +95,7 @@
 </template>
 <script>
 	import fileUpload from '../components/fileUpload.vue'
+	import amap from '../../../libs/amap-wx.js'
 	export default {
 		components: {
 			fileUpload
@@ -175,11 +183,18 @@
 				unitList: [],
 				polluteList: [],
 				fileBaseList: [],
+				key: '00801eb7a8b1d415c94860ccbb765610',
+				amapPlugin: null,
 			}
 		},
 		onReady() {
 			//onReady ���uni-app���������������������������
 			this.$refs.uForm.setRules(this.rules)
+		},
+		onLoad() {
+			this.amapPlugin = new amap.AMapWX({
+				key: this.key //���key ���������������������������������������key
+			})
 		},
 		onShow() {
 			uni.hideTabBar()
@@ -220,7 +235,7 @@
 					success: res => {
 						console.log('������������', res)
 						this.addressInfor = res
-						this.form.pollutePosition = res.address
+						this.form.pollutePosition = `${res.name }  ���  ${res.address}`
 					},
 					fail: function(err) {
 						console.log('������������', err)
@@ -229,16 +244,21 @@
 			},
 			handerLocation() {
 				let that = this
-				uni.getLocation({
-					type: 'wgs84',
-					success: function(res) {
-						console.log('111', res)
-						that.handerChooseLocation(res.latitude, res.longitude)
-					},
-					fail(error) {
-						console.log('������', error)
-					}
-				})
+				if (this.addressInfor.latitude === '') {
+					uni.getLocation({
+						type: 'gcj02',
+						isHighAccuracy: true, //���������������������
+						success: function(res) {
+							console.log('111', res)
+							that.handerChooseLocation(res.latitude, res.longitude)
+						},
+						fail(error) {
+							console.log('������', error)
+						}
+					})
+				} else {
+					that.handerChooseLocation(this.addressInfor.latitude, this.addressInfor.longitude)
+				}
 			},
 			handleOpenSetting() {
 				let that = this
@@ -327,7 +347,7 @@
 				this.$refs.uForm.validate().then(res => {
 					this.sumbitForm.problemDescribe = this.form.problemDescribe
 					this.sumbitForm.pollutePosition = this.form.pollutePosition
-					this.sumbitForm.address = this.addressInfor.address
+					this.sumbitForm.address = this.addressInfor.name
 					this.sumbitForm.latitude = this.addressInfor.latitude
 					this.sumbitForm.longitude = this.addressInfor.longitude
 					this.sumbitForm.name = this.addressInfor.name
@@ -338,12 +358,14 @@
 					this.sumbitForm.changeType = this.form.changeType
 					this.sumbitForm.keyPoint = this.form.keyPoint
 					this.sumbitForm.state = '20'
-					console.log('this.sumbitForm', this.sumbitForm)
 					this.$http.httpPost('/allocation/insert', {
 						...this.sumbitForm
 					}).then(res => {
 						uni.$u.toast('������������')
 						this.close()
+					}).catch(errors => {
+						uni.$u.toast(errors.split(',')[0])
+						console.log(errors)
 					})
 				}).catch(errors => {
 					uni.$u.toast('������������')
@@ -366,12 +388,40 @@
 					this.sumbitForm.unitId = userInfor.unitId
 					this.form.escalationUnitId = data
 					this.sumbitForm.escalationUnitId = userInfor.unitId
+				} else {
+					if (this.unitList.length > 0) {
+						this.form.unitId = this.unitList[0].unitName
+						this.sumbitForm.unitId = this.unitList[0].unitId
+						this.form.escalationUnitId = this.unitList[0].unitName
+						this.sumbitForm.escalationUnitId = this.unitList[0].unitId
+					}
 				}
 				this.form.escalationName = userInfor.userName || ''
 				this.sumbitForm.escalationName = userInfor.userName || ''
 				this.form.investigationType = 1
 				this.sumbitForm.investigationType = 1
-				console.log('this.sumbitForm', this.sumbitForm)
+				let that = this
+				uni.getLocation({
+					type: 'gcj02',
+					isHighAccuracy: true, //���������������������
+					success: function(res) {
+						that.amapPlugin.getRegeo({
+							type: 'gcj02',
+							location: '' + res.longitude + ',' + res.latitude + '',
+							success: function(e) {
+								console.log(e)
+								that.addressInfor.address = `${ e[0].desc }  ���  ${e[0].name}`
+								that.addressInfor.latitude = e[0].latitude
+								that.addressInfor.longitude = e[0].longitude
+								that.addressInfor.name = e[0].desc
+								that.form.pollutePosition = `${ e[0].desc }  ���  ${e[0].name}`
+							},
+							fail: res => {
+								console.log(JSON.stringify(res))
+							}
+						})
+					}
+				})
 			},
 			// ������������������list
 			getUnitList() {
@@ -413,6 +463,11 @@
 			padding-left: 10px;
 		}
 
+		/deep/.u-textarea {
+			padding: 0 !important;
+			width: calc(100%-70px);
+		}
+
 		// /deep/.u-form-item__body {
 		// 	padding: 8px 0px !important;
 		// 	font-size: 15px !important;

--
Gitblit v1.8.0