From b03b0ff2e5c60eb530d525fd2c77f928066d31c5 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Mon, 26 Aug 2024 17:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=20=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  4 +-
 src/components/Map/TrajectoryMap.vue         |  2 +-
 src/components/Map/location/LocationMaps.vue |  6 ++-
 src/views/system/device/index.vue            | 40 ++++++++++++++------
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.env.development b/.env.development
index f256ec4..ff3563b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
 ENV = 'development'
 
 # 共享电动车管理系统/开发环境
-# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
-VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
+VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
 
 # VUE_APP_BASE_API = 'http://192.168.2.75:8088'
 
diff --git a/src/components/Map/TrajectoryMap.vue b/src/components/Map/TrajectoryMap.vue
index e8c12a5..16f71ca 100644
--- a/src/components/Map/TrajectoryMap.vue
+++ b/src/components/Map/TrajectoryMap.vue
@@ -138,7 +138,7 @@ export default {
       AMapLoader.load({
         key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ["AMap.MoveAnimation"]
+        plugins: ["AMap.PlaceSearch", "AMap.MoveAnimation"], // 确保包含 "AMap.MoveAnimation"
       }).then((AMap) => {
         let abb;
       try {
diff --git a/src/components/Map/location/LocationMaps.vue b/src/components/Map/location/LocationMaps.vue
index 323b381..2dcecbd 100644
--- a/src/components/Map/location/LocationMaps.vue
+++ b/src/components/Map/location/LocationMaps.vue
@@ -146,7 +146,7 @@ export default {
       AMapLoader.load({
         key: globalConfig.aMap.key, // 申请好的Web端开发者Key，首次调用 load 时必填
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ["AMap.PlaceSearch"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        plugins: ["AMap.PlaceSearch", "AMap.MoveAnimation"], // 确保包含 "AMap.MoveAnimation"
       }).then((AMap) => {
         this.AMap = AMap;
         this.map = new AMap.Map("container", {
@@ -191,6 +191,7 @@ export default {
       });
     },
       trajectory() {
+        this.marker=null
         console.log('轨迹调用了11',this.tripRouteStr);
       this.line = JSON.parse(this.tripRouteStr)
       console.log("this.line================" + this.line)
@@ -201,6 +202,7 @@ export default {
         console.error("Error parsing tripRouteStr:", error);
         return;
       }
+      console.log(abb);
       let latitude = parseFloat(abb[0][1]);
       let longitude = parseFloat(abb[0][0]);
       let latitude1 = parseFloat(abb[abb.length - 1][1]);
@@ -593,10 +595,12 @@ export default {
       this.doSearchNearBy(keyword, center.lng, center.lat, 1000);
     },
     startAnimation() {
+       console.log(this.marker,'this.markerthis.marker');
       this.marker.moveAlong(this.line, {
         // 每一段的时长
         duration: 200,//可根据实际采集时间间隔设置
       });
+     
     },
     pauseAnimation() {
       this.marker.pauseMove();
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 3744455..48d3c03 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -812,7 +812,7 @@
             
             </el-row> -->
             <location-map
-              v-if="showPlaceSearchMap&&tripRouteStr!=''"
+              v-if="showPlaceSearchMap && tripRouteStr != ''"
               ref="map"
               height="400px"
               :key="key"
@@ -1011,8 +1011,8 @@ export default {
       selected: null,
       // 表单参数
       form: {},
-      startTime: "2024-08-20 20:22",
-      endTime: "2024-08-22 16:00",
+      startTime: "",
+      endTime: "",
       // 表单校验
       rules: {
         // modelId: [
@@ -1094,7 +1094,6 @@ export default {
         this.showPlaceSearchMap = true; // 打开地图
       }
     },
-    
   },
   beforeDestroy() {
     this.$eventBus.$off("close-all-dialogs", this.closeDialog);
@@ -1102,14 +1101,14 @@ export default {
   methods: {
     startTimecg(value) {
       console.log("start变化", value);
-      if(this.startTime!=''&&this.endTime!=''){
-          this.gettj()
+      if (this.startTime != "" && this.endTime != "") {
+        this.gettj();
       }
     },
     endTimecg(value) {
       console.log("start变化", value);
-      if(this.startTime!=''&&this.endTime!=''){
-        this.gettj()
+      if (this.startTime != "" && this.endTime != "") {
+        this.gettj();
       }
     },
     handleScroll() {
@@ -1392,7 +1391,7 @@ export default {
         qrcode: null,
         longitude: null,
         latitude: null,
-        tripRouteStr: '',
+        tripRouteStr: "",
       };
       this.resetForm("form");
       if (this.userName === "admin") {
@@ -1461,7 +1460,21 @@ export default {
       this.showPlaceSearchMap = true;
       this.key++;
       this.orderRecordKey += 1;
-      this.gettj()
+      // 获取当前日期并设置时间格式
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = String(now.getMonth() + 1).padStart(2, "0");
+      const day = String(now.getDate()).padStart(2, "0");
+      const hours = String(now.getHours()).padStart(2, "0");
+      const minutes = String(now.getMinutes()).padStart(2, "0");
+
+      // 设置 startTime 为当天凌晨 0 点
+      this.startTime = `${year}-${month}-${day} 00:00`;
+
+      // 设置 endTime 为当前时间
+      this.endTime = `${year}-${month}-${day} ${hours}:${minutes}`;
+
+      this.gettj();
     },
     gettj() {
       let data = {
@@ -1469,14 +1482,17 @@ export default {
         startTime: this.formatDate(this.startTime),
         endTime: this.formatDate(this.endTime),
       };
+      this.showPlaceSearchMap=false
+     
       gettrajectory(data).then((response) => {
         this.tripRouteStr = response.data;
         // this.re
+        this.showPlaceSearchMap=true
         setTimeout(() => {
+         
           this.$refs.map.trajectory();
         }, 600);
-        
-       
+
         // console.log(this.tripRouteStr,'this.tripRouteStr');
       });
     },