From 141f0f504e7ad17dedb5837055a64aaefa54267a Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 3 Sep 2024 10:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=A1=8C=E7=A8=8B=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=90=9C=E7=B4=A2=E5=BD=93=E5=A4=A9=E8=A1=8C=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F=E3=80=81?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BD=A6=E8=BE=86=E5=81=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  9 ++++---
 .../bigScreen/components/mapLeftContent.vue   |  4 +--
 src/views/bigScreen/map/index.vue             | 14 +++++------
 src/views/components/mapLeftNumber/index.vue  | 17 +++++++++++++
 src/views/components/mapRight/index.vue       | 17 +++++++++++++
 src/views/components/personagetrack/index.vue | 25 +++++++++++++++++++
 6 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index ecd8a64..c468618 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -184,7 +184,8 @@ aside {
   }
 }
 // 滚动条隐藏
-::-webkit-scrollbar {
-  width: 0 !important;
-  height: 0;
-}
+// ::-webkit-scrollbar {
+//   width: 0 !important;
+//   height: 0;
+// }
+
diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index df1bcc8..302a902 100644
--- a/src/views/bigScreen/components/mapLeftContent.vue
+++ b/src/views/bigScreen/components/mapLeftContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:44:13
  * @LastEditors: JC9527
- * @LastEditTime: 2024-08-15 11:01:20
+ * @LastEditTime: 2024-09-02 18:56:45
 -->
 <template>
   <div class="left-wai-box">
@@ -82,7 +82,7 @@
       </div>
       <div class="item lfet-list-two" :style="itemOne">
         <title-box title="车辆在线情况"></title-box>
-        <map-number title="在线车辆总数" :onLine="10" :sum="18" type="辆" :numberArray="vehicleArray" :height="oneHeight"
+        <map-number title="在线车辆总数" :onLine="0" :sum="18" type="辆" :numberArray="vehicleArray" :height="oneHeight"
           :id="3" v-on="$listeners"></map-number>
       </div>
     </div>
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index c1b9d16..5f246f8 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-08-15 16:44:12
+ * @LastEditTime: 2024-09-02 19:12:35
 -->
 <template>
   <div class="map-main">
@@ -1006,12 +1006,12 @@ export default {
     },
     // 车辆非聚合自定义样式及点击事件
     _carMarker(context){
-      var content = `<div class="markerStyles"><img src="${require("../../../assets/images/icon/icon4.png")}" alt=""></div>`;
+      var content = `<div class="markerStyles"><img src="${require("../../../assets/images/icon/offLine3.png")}" alt=""></div>`;
       var offset = new AMap.Pixel(-13, -16);
       context.marker.setContent(content)
       context.marker.setOffset(offset)
       context.marker.on('click',(ev)=>{
-        this.carInfo.position = context.data[0].position;
+        this.carInfo.position = context.data[0].position; 
         this.carInfo.info = context.data[0].info;
         this.carInfo.visible = true;
       })
@@ -1316,7 +1316,7 @@ export default {
     },
     // 点位点击事件
     clickMarker(marker,e){
-      console.log(marker);
+      // console.log(marker);
       if (this.actionMap == 1) {
         this.personInfo.position = marker.position;
         this.personInfo.info = marker.info;
@@ -1334,7 +1334,7 @@ export default {
       } else if (this.actionMap == 5) {
         this.shopInfo.position = marker.position;
         this.shopInfo.info = marker.info;
-        console.log(marker.info);
+        // console.log(marker.info);
         this.shopInfo.visible = true;
       }
     },
@@ -1458,7 +1458,7 @@ export default {
     // 执法人员强制观摩
     watchClick(){
       if(this.personInfo.info.status == "1") {
-        console.log(this.personInfo.info);
+        // console.log(this.personInfo.info);
         this.showVideo = true;
         videoSurveillance({...this.videoCondition,destID:this.personInfo.info.userId,imei:this.personInfo.info.imei}).then(res=>{
           if(res.code == 200 && res.data.msg == '操作成功') {
@@ -1487,7 +1487,7 @@ export default {
     },
     // 位置分享
     shareClick(){
-      console.log(this.personInfo,"位置分享");
+      // console.log(this.personInfo,"位置分享");
       if(this.personInfo.info.status == "1") {
         var aux = document.createElement("input");
         aux.setAttribute("value", this.personInfo.info.address);
diff --git a/src/views/components/mapLeftNumber/index.vue b/src/views/components/mapLeftNumber/index.vue
index 80a6495..e3aa7d5 100644
--- a/src/views/components/mapLeftNumber/index.vue
+++ b/src/views/components/mapLeftNumber/index.vue
@@ -195,6 +195,23 @@ export default {
     // height: 120px;
     overflow-y: scroll;
   }
+  .left--lists::-webkit-scrollbar-track {
+    background: rgba(0, 0, 0, 0.1);
+    border-radius: 0;
+  }
+
+  .left--lists::-webkit-scrollbar {
+    -webkit-appearance: none;
+    width: 6px;
+    height: 3px;
+  }
+
+  .left--lists::-webkit-scrollbar-thumb {
+    cursor: pointer;
+    border-radius: 5px;
+    background: rgba(7, 127, 255, 0.5);
+    transition: color 0.2s ease;
+  }
   .main-lists {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/components/mapRight/index.vue b/src/views/components/mapRight/index.vue
index 0f00532..93e0df9 100644
--- a/src/views/components/mapRight/index.vue
+++ b/src/views/components/mapRight/index.vue
@@ -144,6 +144,23 @@ export default {
     overflow-y: scroll;
     // height: 99px;
   }
+  .lists-main::-webkit-scrollbar-track {
+    background: rgba(0, 0, 0, 0.1);
+    border-radius: 0;
+  }
+
+  .lists-main::-webkit-scrollbar {
+    -webkit-appearance: none;
+    width: 6px;
+    height: 3px;
+  }
+
+  .lists-main::-webkit-scrollbar-thumb {
+    cursor: pointer;
+    border-radius: 5px;
+    background: rgba(7, 127, 255, 0.5);
+    transition: color 0.2s ease;
+  }
   .main {
     padding: 0 24px;
     // display: flex;
diff --git a/src/views/components/personagetrack/index.vue b/src/views/components/personagetrack/index.vue
index 3acb73e..3f8cd00 100644
--- a/src/views/components/personagetrack/index.vue
+++ b/src/views/components/personagetrack/index.vue
@@ -332,6 +332,9 @@ export default {
         this.title = "人员行程轨迹";
         this.personItem = item;
         this.person = true;
+        this.queryTime.fromTime = this.getCurrentTime();
+        this.queryTime.toTime = this.getCurrentTime(1);
+        this.query();
       } else {
         this.title = "车辆行程轨迹";
         this.person = false;
@@ -448,6 +451,28 @@ export default {
         })
       }
     },
+    // 获取当前时间
+    getCurrentTime(id){
+      // 获取当前时间
+      const now = new Date();
+
+      // 获取年月日时分秒
+      const year = now.getFullYear();
+      const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以加1，并且格式化为两位数
+      const day = String(now.getDate()).padStart(2, '0'); // 格式化为两位数
+      const hours = String(now.getHours()).padStart(2, '0');
+      const minutes = String(now.getMinutes()).padStart(2, '0');
+      const seconds = String(now.getSeconds()).padStart(2, '0');
+
+      // 格式化为字符串
+      const formattedDateTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      const formattedTime = `${year}-${month}-${day} 00:00:00`;
+      if(id == 1) {
+        return formattedDateTime;
+      } else {
+        return formattedTime;
+      }
+    },
   },
 };
 </script>