Merge branch 'feature-gaode-circle' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-01-19 10:08:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-05-23 10:44:53
+ * @LastEditTime: 2022-06-17 16:41:20
  * @FilePath: \AntpayFrontEnd\README.md
  * @description: 项目说明文档
 -->
@@ -114,4 +114,10 @@ ci
 - 删除 多页面配置
 
 feature
-- 增加 一个判断点是否在多个围栏单页面
+- 增加 一个判断点是否在多个围栏单页面
+
+### v1.0.7
+`2022.06.17`
+feature
+- PointInRing
+    - 增加 圆形或者marker拖拽

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-05-23 10:45:19
+ * @LastEditTime: 2022-06-17 16:40:14
  * @FilePath: \AntpayFrontEnd\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.6'; //版本号
+export const VERSION_MODEL = '1.0.7'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/gaode-demo/PointInRing.vue

@@ -203,8 +203,11 @@ export default {
     // 创建圆形
     createCircle() {
         console.log("this.map.center", this.map.center);
+        if(this.currentCircle) {
+            this.map.instance.remove(this.currentCircle)
+        }
         this.currentCircle =  new AMap.Circle({
-            center: this.circlePolygon.center,
+            center: this.map.center.toString().split(','),
             radius: this.circlePolygon.radius,
             borderWeight: 3,
             strokeColor: "red",
@@ -223,7 +226,12 @@ export default {
     // 推拽圆
     computeCircle() {
         let point = this.currentCircle.getCenter();
-        this.circlePolygon.center = point;
+        //this.map.center = point;
+        if(this.map.marker) {
+            this.map.instance.remove(this.map.marker)
+        }
+        this.map.center = point.toString().split(',')
+        this.createMarker();
         /* console.log("circleCenter", circleCenter); */
         let polygonCircleListMap = this.polygonList.map(item => {
             return {
@@ -251,6 +259,7 @@ export default {
     computeMarker() {
         let point = this.map.marker.getPosition();
         this.map.center = point.toString().split(',');
+        this.createCircle();
         /* console.log("circleCenter", circleCenter); */
         let polygonCircleListMap = this.polygonList.map(item => {
             return {