From cc7f6a1508d82c2856b8541ed49c7bfb958f0ff5 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Wed, 1 Feb 2023 17:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/request.js                             |   4 +--
 pages/massif/info.vue                         |   4 +--
 pages/massif/mana/recovery.vue                |   7 +++-
 static/map_point_1.png                        | Bin 0 -> 1940 bytes
 static/map_point_2.png                        | Bin 0 -> 1622 bytes
 .../d-form/components/d-form/d-form.vue       |  34 +++++++++++-------
 6 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 static/map_point_1.png
 create mode 100644 static/map_point_2.png

diff --git a/common/request.js b/common/request.js
index 46b1ead..b292f9d 100644
--- a/common/request.js
+++ b/common/request.js
@@ -2,8 +2,8 @@ import store from "@/store"
 
 export function host(host='default',suffix='/plant_manage'){
 	var url=process.env.NODE_ENV === 'development'?{
-			default:`http://zrxsae.natappfree.cc` //陈
-			// default:`http://uq5pak.natappfree.cc` //马
+			// default:`http://zrxsae.natappfree.cc` //陈
+			default:`http://uq5pak.natappfree.cc` //马
 		}:{
 			default:`http://qv6mj8.natappfree.cc`
 		}
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 5c6f995..7b4d0dc 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -14,7 +14,7 @@
 				v-bind="v"
 				:required="!!rules[k]"
 				:field="k"
-				:value="(/^dateRange$|^select$/.test(v.type)?fields[k].value:formData[k])"
+				:value="(/^dateRange$|^select$|^map$/.test(v.type)?fields[k].value:formData[k])"
 				ref="dForm"
 				@input="formData[k]=$event"
 				@selectRDate="selectDate"
@@ -37,7 +37,7 @@ import request from '@/common/request'
 					realityArea:{label:"实际面积",type:'digit'},
 					image:{label:"地块图片",type:"upImg",num:3,value:''},
 					date:{label:"使用日期",type:"dateRange",value:[]},
-					jw:{label:"经/纬度",type:"map"},
+					jw:{label:"经/纬度",type:"map",value:[]},
 					address:{label:"详细地址",type:"textarea"},
 				},
 				formData:{
diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 901de2a..996be40 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -118,7 +118,7 @@
 			@close="show=false"
 			@cancel="show=false"
 			:value="date"
-			@confirm="searchVal[dateType]=new Date($event.value).format('yyyy-MM-dd');show=false"/>
+			@confirm="searchVal[dateType]=new Date($event.value).format('yyyy-MM-dd');clean();search();show=false"/>
 	</view>
 </template>
 <script>
@@ -163,6 +163,11 @@ export default {
 				this.search(plantId)
 			})
 		},
+		chean(){
+			this.list=[]
+			this.total=0
+			this.searchVal.pageNo=1
+		},
 		async search(plantId=''){
 			if(this.total==0||this.list.length<this.total){
 				var res=await request("/api/plantHarvest/list",{
diff --git a/static/map_point_1.png b/static/map_point_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cd6d4f5aaa3526c0354e1508890c8206f820117
GIT binary patch
literal 1940
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
a+HV1de438kfsoh$0000<MNUMnLSTYocGr0T

literal 0
HcmV?d00001

diff --git a/static/map_point_2.png b/static/map_point_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e904b0b799a21f23ce4574c466eb5fc618d74201
GIT binary patch
literal 1622
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
U;P?rXod5s;07*qoM6N<$g0k`#KmY&$

literal 0
HcmV?d00001

diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index cad5254..bece717 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -381,6 +381,9 @@ import {dataType} from 'black-knight/lib/config/tools'
 				})
 			}
 		},
+		activated(){
+			console.log("-------activated---------------")
+		},
 		methods:{
 			async afterRead(e){
 				this.imgList=this.imgList.concat(e.file.map(v=>Object.assign(v,{
@@ -426,27 +429,34 @@ import {dataType} from 'black-knight/lib/config/tools'
 				this.showMap=true
 				if(!this.maps){
 					var amap=uni.createMapContext("amap",this)
+
 					this.maps=amap.$getAppMap()
 					this.maps.setMapType(plus.maps.MapType.MAPTYPE_SATELLITE)
 					this.maps.onclick=(e)=>{
 						console.log(e,'-------maps--click---------')
 					}
-					var polygon=new plus.maps.Polygon([
-						new plus.maps.Point(116.39524,39.925301),
-						new plus.maps.Point(116.400444,39.925285),
-						new plus.maps.Point(116.400558,39.923282),
-						new plus.maps.Point(116.395502,39.923082),
-					])
-					polygon.setLineWidth(2)
-					polygon.setStrokeColor("#10C176")
-					polygon.setFillColor("#10C176")
-					polygon.setFillOpacity(0.3)
-					this.maps.addOverlay(polygon)
+					// var polygon=new plus.maps.Polygon([
+					// 	new plus.maps.Point(116.39524,39.925301),
+					// 	new plus.maps.Point(116.400444,39.925285),
+					// 	new plus.maps.Point(116.400558,39.923282),
+					// 	new plus.maps.Point(116.395502,39.923082),
+					// ])
+					// polygon.setLineWidth(2)
+					// polygon.setStrokeColor("#10C176")
+					// polygon.setFillColor("#10C176")
+					// polygon.setFillOpacity(0.3)
+					// this.maps.addOverlay(polygon)
 					
 					var marker=new plus.maps.Marker(new plus.maps.Point(116.396137,39.924055));
-					marker.setIcon("/static/tab_home.png");
+					marker.setIcon("/static/map_point_1.png");
 					marker.bringToTop()
 					marker.setDraggable(true)
+					marker.onclick= e=>{
+						console.log('---onclick----')
+					}
+					marker.onDrag= e=>{
+						console.log("-----Drag:",JSON.stringify(e.getPoint()))
+					}
 					this.maps.addOverlay(marker);
 				}
 				/* #endif */