Merge branch 'LAO_MO' into online

src/layout/components/TagsView.vue

@@ -102,7 +102,7 @@ export default {
         if (this.isActive(view)) {
           const latestView = views.slice(-1)[0]
           if (latestView) {
-            this.$router.push(latestView.path)
+            this.$router.push(latestView.fullPath)
           } else {
             this.$router.push('/')
           }

src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -1,5 +1,107 @@
 <template>
   <div>
     gps
+    <!-- <el-amap-search-box class="search-box"
+                        value="searchValue"
+                        :search-option="searchOption"
+                        :on-search-result="onSearchResult"></el-amap-search-box> -->
+    <el-amap :zoom="zoom"
+             vid="amapDemo"
+             :amap-manager="amapManager"
+             :plugin="plugin"
+             :center="center"
+             class="amap-demo">
+      <!--  :events="markerEvents()" -->
+      <el-amap-marker v-for="(marker, index) in markers"
+                      :key="index"
+                      :position="marker"></el-amap-marker>
+    </el-amap>
   </div>
-</template>
+</template> 
+<script>
+import VueAMap from 'vue-amap'
+// 地图
+(function () {
+  let func = EventTarget.prototype.addEventListener;
+  let supportsPassive = false
+  try {
+    let opts = Object.defineProperty({}, 'passive', {
+      get: function () {
+        supportsPassive = true;
+      }
+    })
+    document.addEventListener("testPassive", null, opts);
+    document.removeEventListener('testPassive', null, opts);
+  } catch (e) { }
+
+  EventTarget.prototype.addEventListener = function (type, fn, capture) {
+    this.func = func;
+    capture = capture instanceof Object ? capture : {};
+    capture.passive = supportsPassive;
+    this.func(type, fn, capture);
+  };
+}());
+// Vue.use(VueAMap)
+VueAMap.initAMapApiLoader({
+  key: 'b1e6ac2eb28902ce91a490edf194e000',
+  plugin: ['AMap.Geolocation', 'AMap.PlaceSearch', 'AMap.Geocoder'],
+  v: '1.4.4'
+})
+let amapManager = new VueAMap.AMapManager();
+export default {
+  data () {
+    return {
+      zoom: 20,
+      amapManager,
+      center: [114.34371, 30.55939],
+      // events: {
+      //   init (o) {
+      //     let marker = new AMap.Marker({
+      //       position: [114.34371, 30.55939]
+      //     });
+
+      //     marker.setMap(o);
+      //   }
+      // },
+      markers: [
+        [114.34361, 30.55949],
+        [114.34381, 30.55949],
+      ],
+      plugin: [],
+    }
+  },
+  mounted () {
+    this.getDistance()
+  },
+  activated () {
+    this.getDistance()
+  },
+  methods: {
+    // 地点搜索
+    // searchOption () { },
+    // 重置
+    onSearchResult () { },
+    getDistance () {
+      let o = amapManager.getMap();
+      let marker1 = new AMap.Marker({
+        position: [121.59996, 31.177646]
+      });
+      let marker2 = new AMap.Marker({
+        position: [121.59976, 31.177646]
+      });
+
+      let p1 = marker1.getPosition();
+      let p2 = marker2.getPosition();
+      var distance = Math.round(p1.distance(p2));
+      console.log(distance)
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.amap-demo {
+  height: 300px;
+}
+</style>

vue.config.js

@@ -19,9 +19,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
-// let target = 'http://192.168.3.28:8000' //邹璇
+let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-let target = 'http://admin.dayaedu.com' // 测试服
+// let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {