From 4cf26ef260db0c24c24dc8621a55914d43b894bc Mon Sep 17 00:00:00 2001
From: copper <copper.w@foxmail.com>
Date: Sun, 6 Dec 2020 17:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dslot-scope=20record=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E5=8C=B9=E9=85=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/admin/forms/PositionSelect.vue | 20 +++++---
 src/components/admin/tables/ProjectTable.vue  |  2 +-
 src/components/admin/tables/SensorTable.vue   |  2 +-
 src/components/admin/tables/UserTable.vue     |  2 +-
 src/components/map/Index.vue                  | 26 ++++++----
 src/components/utils/amap.js                  | 50 +++++++++++++++++++
 vue.config.js                                 |  2 +-
 7 files changed, 84 insertions(+), 20 deletions(-)
 create mode 100644 src/components/utils/amap.js

diff --git a/src/components/admin/forms/PositionSelect.vue b/src/components/admin/forms/PositionSelect.vue
index c0a8733..bf28ef2 100644
--- a/src/components/admin/forms/PositionSelect.vue
+++ b/src/components/admin/forms/PositionSelect.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { fromLonLat, toLonLat } from "ol/proj.js";
+const { fromLonLat, toLonLat } = ol.proj
 import { PointSelect } from "@/components/utils/olInteraction";
 import { deleteJSON, postJSON, URL_MAP } from "@/utils/http";
 let mapForSelect = null
@@ -73,17 +73,23 @@ export default {
         }))
     },
     init() {
-      var osm = new ol.source.OSM();
-      var layer = new ol.layer.Tile({
-        source: osm,
-        wrapX: false,
+       this.projection = ol.proj.get("EPSG:3857");
+      var AMapLayer = new ol.layer.Tile({
+        // source: new ol.source.XYZ({
+        //   url:
+        //     "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+        // }),
+        source: new ol.source.XYZ({
+          url:
+            "http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}",
+          crossOrigin: "anonymous",
+        }),
       });
-      this.projection = osm.getProjection();
       
       mapForSelect = new ol.Map({
         interactions: ol.interaction.defaults().extend([new PointSelect(this.pointFeature)]),
         layers: [
-          layer,
+          AMapLayer,
           new ol.layer.Vector({
             source: new ol.source.Vector({
               features: [ new ol.Feature(this.pointFeature)],
diff --git a/src/components/admin/tables/ProjectTable.vue b/src/components/admin/tables/ProjectTable.vue
index 8a5b7db..ddefd31 100644
--- a/src/components/admin/tables/ProjectTable.vue
+++ b/src/components/admin/tables/ProjectTable.vue
@@ -20,7 +20,7 @@
           {{ item.name }}
         </a-tag>
       </span>
-      <span slot="action" slot-scope="text, record">
+      <span slot="action" slot-scope="record">
         <a-button size="small" type="link" @click="() => handleDetail(record)"
           >查看</a-button
         >
diff --git a/src/components/admin/tables/SensorTable.vue b/src/components/admin/tables/SensorTable.vue
index 026532d..967547b 100644
--- a/src/components/admin/tables/SensorTable.vue
+++ b/src/components/admin/tables/SensorTable.vue
@@ -10,7 +10,7 @@
       :rowKey="idName"
       @change="handleTableChange"
     >
-    <span slot="action" slot-scope="text, record">
+    <span slot="action" slot-scope="record">
       <a-button size="small" type="link" @click="() => handleDetail(record)" >查看</a-button>
       <a-divider type="vertical" />
       <a-button type="danger" size="small" @click="() => handleDelete(record)" >删除</a-button>
diff --git a/src/components/admin/tables/UserTable.vue b/src/components/admin/tables/UserTable.vue
index d018170..4f6b2bb 100644
--- a/src/components/admin/tables/UserTable.vue
+++ b/src/components/admin/tables/UserTable.vue
@@ -15,7 +15,7 @@
           {{ permissionMap[permission] }}
       </a-tag>
     </span>
-    <span slot="action" slot-scope="text, record">
+    <span slot="action" slot-scope="record">
       <a-button size="small" type="link" @click="() => handleDetail(record)" >查看</a-button>
       <a-divider type="vertical" />
       <a-button type="danger" size="small" @click="() => handleDelete(record)" >删除</a-button>
diff --git a/src/components/map/Index.vue b/src/components/map/Index.vue
index 35680e6..96f072a 100644
--- a/src/components/map/Index.vue
+++ b/src/components/map/Index.vue
@@ -12,7 +12,8 @@
 </template>
 
 <script>
-import { fromLonLat, toLonLat } from "ol/proj.js";
+// import { fromLonLat, toLonLat } from "ol/proj.js";
+const { fromLonLat, toLonLat } = ol.proj;
 import { getData, login, logout, URL_MAP } from "@/utils/http";
 
 let map = null;
@@ -39,22 +40,29 @@ export default {
   },
   methods: {
     mapinit() {
-      var osm = new ol.source.OSM();
-      var layer = new ol.layer.Tile({
-        source: osm,
-        wrapX: false,
-      });
-      this.projection = osm.getProjection();
+      this.projection = ol.proj.get("EPSG:3857");
+     
       this.waterLayer = this.getDeviceVectorLayer();
-
+      var AMapLayer = new ol.layer.Tile({
+        // source: new ol.source.XYZ({
+        //   url:
+        //     "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+        // }),
+        source: new ol.source.XYZ({
+          url:
+            "http://cache1.arcgisonline.cn/arcgis/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}",
+          crossOrigin: "anonymous",
+        }),
+      });
       this.view = new ol.View({
         center: this.center,
         zoom: 10,
+        projection: this.projection,
       });
 
       map = new ol.Map({
         target: "map",
-        layers: [layer],
+        layers: [AMapLayer],
         view: this.view,
       });
 
diff --git a/src/components/utils/amap.js b/src/components/utils/amap.js
new file mode 100644
index 0000000..f65766a
--- /dev/null
+++ b/src/components/utils/amap.js
@@ -0,0 +1,50 @@
+export function wgs84togcj02(wgs_lon, wgs_lat)
+{
+    if (out_of_china(wgs_lon, wgs_lat))
+    {
+        //不在国内
+        let back = [ wgs_lon, wgs_lat ];
+        return back;
+    }
+    else
+    {
+       var dwgs_lon = transformlon(wgs_lon - 105.0, wgs_lat - 35.0);
+       var dwgs_lat = transformlat(wgs_lon - 105.0, wgs_lat - 35.0);
+       var radwgs_lat = wgs_lat / 180.0 * Math.PI;
+       var magic = Math.sin(radwgs_lat);
+       var magic = 1 - ee * magic * magic;
+       var sqrtmagic = Math.sqrt(magic);
+       var dwgs_lon = (dwgs_lon * 180.0) / (a / sqrtmagic * Math.cos(radwgs_lat) * Math.PI);
+       var dwgs_lat = (dwgs_lat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * Math.PI);
+       var gcj_lon = wgs_lon + dwgs_lon;
+       var gcj_lat = wgs_lat + dwgs_lat;
+       var gcj = [ gcj_lon, gcj_lat ];
+        return gcj;
+    }
+}
+
+function transformlon(lon, lat)
+{   
+    var PI = Math.PI
+    var ret = 300.0 + lon + 2.0 * lat + 0.1 * lon * lon + 0.1 * lon * lat + 0.1 * Math.sqrt(Math.abs(lon));
+    ret += (20.0 * Math.sin(6.0 * lon * PI) + 20.0 * Math.sin(2.0 * lon * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lon * PI) + 40.0 * Math.sin(lon / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (150.0 * Math.sin(lon / 12.0 * PI) + 300.0 * Math.sin(lon / 30.0 * PI)) * 2.0 / 3.0;
+    return ret;
+}
+
+function transformlat(lon, lat)
+{   
+    var PI = Math.PI
+    var ret = -100.0 + 2.0 * lon + 3.0 * lat + 0.2 * lat * lat + 0.1 * lon * lat + 0.2 * Math.sqrt(Math.abs(lon));
+    ret += (20.0 * Math.sin(6.0 * lon * PI) + 20.0 * Math.sin(2.0 * lon * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+    return ret;
+}
+
+//判断是否在国内，不在国内则不做偏移
+function out_of_china(lon, lat)
+{
+    return (lon < 72.004 || lon > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+}
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 6bc0e58..3d83104 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,7 +10,7 @@ module.exports = {
         proxy: {
             '/backend': {
                 // target: 'http://223.75.53.208:8081',
-                target: 'http://127.0.0.1:7788',
+                target: 'http://121.36.155.145:10025/',
             }
         }
     },