From 3fc9db99bc4ea4572ae37906eb1c9b6768c6bfa3 Mon Sep 17 00:00:00 2001
From: Lvtf <L18864257234@163.com>
Date: Thu, 17 Aug 2023 21:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               |  2 +-
 .../bigScreen/components/mapLeftContent.vue   |  4 +-
 .../bigScreen/components/mapRightContent.vue  |  4 +-
 src/views/bigScreen/map/index.vue             | 40 ++++++++++---------
 src/views/components/carPopup/index.vue       | 35 +++++++++++++++-
 src/views/components/eventPopup/index.vue     | 27 ++++++++++++-
 src/views/components/mapLeftNumber/index.vue  |  2 +-
 .../components/monitoringPopup/index.vue      | 35 +++++++++++++++-
 src/views/components/personPopup/index.vue    | 29 +++++++++++++-
 10 files changed, 149 insertions(+), 31 deletions(-)

diff --git a/.env.development b/.env.development
index 4511d48..32b64ea 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 城市精细化管理监测主题
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index b83c255..4070ee3 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 城市精细化管理监测主题
 
 # 生产环境配置
 ENV = 'production'
diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index 3a00c7e..c2d64a6 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: 2023-08-16 10:53:31
+ * @LastEditTime: 2023-08-17 21:03:34
 -->
 <template>
   <div class="left-box">
@@ -140,7 +140,7 @@ export default {
 .left-box {
   display: grid;
   grid-column: 1fr;
-  grid-row-gap: 15px;
+  grid-row-gap: 19px;
   .item {
     // background: rgba(222, 225, 230, 0.6);
     .item-main {
diff --git a/src/views/bigScreen/components/mapRightContent.vue b/src/views/bigScreen/components/mapRightContent.vue
index b070db3..63e5cfc 100644
--- a/src/views/bigScreen/components/mapRightContent.vue
+++ b/src/views/bigScreen/components/mapRightContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 11:09:57
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-16 10:49:03
+ * @LastEditTime: 2023-08-17 21:00:46
 -->
 <template>
   <div class="right-box">
@@ -100,7 +100,7 @@ export default {
 .right-box {
   display: grid;
   grid-column: 1fr;
-  grid-row-gap: 15px;
+  grid-row-gap: 20px;
   .item {
     // background: rgba(222, 225, 230, 0.6);
     // height: 161px;
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index a6adb36..ec00f6a 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-14 15:46:26
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-17 18:16:09
+ * @LastEditTime: 2023-08-17 21:32:14
 -->
 <!--
  * @Descripttion: 
@@ -41,11 +41,11 @@
           <i slot="suffix" class="el-icon-search" @click="search"></i>
         </el-input>
       </div>
-      <div class="laser-positioning" @click="positioning()">
+      <div class="laser-positioning">
         <span>地图扎点</span>
         <img src="@/assets/images/positioning.png" alt="">
       </div>
-      <div class="creation-task" @click="createdTask()">
+      <div class="creation-task">
         <span>任务创建</span>
         <img src="@/assets/images/createdTask.png" alt="">
       </div>
@@ -110,10 +110,10 @@
     <personage-track ref="personageTrack"></personage-track>
     <crew-assign ref="crewAssign"></crew-assign>
     <video-wall ref="videoWall"></video-wall>
-    <person-popup v-if="personPopup" v-on:personClose="personClose" v-on:getRoute="presoninfo"></person-popup>
-    <event-popup v-if="eventPopup" v-on:eventClose="eventClose" v-on:zhipai="personzhipai"></event-popup>
-    <car-popup v-if="carPopup" v-on:carClose="carClose" v-on:carinfo="carinfo"></car-popup>
-    <monitoring-popup v-if="monitoringPopup" v-on:monitoringClose="monitoringClose" v-on:monitoringInfo="monitoringInfo"></monitoring-popup>
+    <person-popup v-if="personPopup" v-on:personClose="personClose" v-on:getRoute="presoninfo" :point="mypoint"></person-popup>
+    <event-popup v-if="eventPopup" v-on:eventClose="eventClose" v-on:zhipai="personzhipai" :point="mypoint"></event-popup>
+    <car-popup v-if="carPopup" v-on:carClose="carClose" v-on:carinfo="carinfo" :point="mypoint"></car-popup>
+    <monitoring-popup v-if="monitoringPopup" v-on:monitoringClose="monitoringClose" v-on:monitoringInfo="monitoringInfo" :point="mypoint"></monitoring-popup>
   </div>
 </template>
 <script>
@@ -180,7 +180,8 @@ export default {
       personPopup:false,
       eventPopup:false,
       carPopup:false,
-      monitoringPopup:false
+      monitoringPopup:false,
+      mypoint:{},
     }
   },
   methods:{
@@ -276,15 +277,15 @@ export default {
       })
       let ico2 = L.icon({
         iconUrl: require('../../../assets/images/icon/icon2.png'),
-        iconSize: [52, 81],
+        iconSize: [44, 91],
       })
       let ico3 = L.icon({
         iconUrl: require('../../../assets/images/icon/icon3.png'),
-        iconSize: [52, 81],
+        iconSize: [44, 91],
       })
       let ico4 = L.icon({
         iconUrl: require('../../../assets/images/icon/icon4.png'),
-        iconSize: [52, 81],
+        iconSize: [45, 95],
       })
       let ico5 = L.icon({
         iconUrl: require('../../../assets/images/icon/icon5.png'),
@@ -349,6 +350,7 @@ export default {
     markerClick(marker){
       marker.on('click', e => {
         console.log(e);
+        this.mypoint = e.containerPoint;
         if(this.actionMap == 1) {
           this.personPopup = true;
         } else if(this.actionMap == 2) {
@@ -468,13 +470,13 @@ export default {
     },
     actionBtn(id){
       this.action = id;
-      console.log(id)
-      this.$emit('actionBtn',id);
-      if(id == 1){
-        this.$refs.personageTrack.open();
-      } else {
-        this.$refs.crewAssign.open();
-      }
+      // console.log(id)
+      // this.$emit('actionBtn',id);
+      // if(id == 1){
+      //   this.$refs.personageTrack.open();
+      // } else {
+      //   this.$refs.crewAssign.open();
+      // }
     },
     // 输入框的搜索框点击事件
     search(){
@@ -486,7 +488,7 @@ export default {
     },
     // 地图扎点的点击事件
     positioning(){
-      this.$refs.videoWall.open();
+      // this.$refs.videoWall.open();
     },
     // 切换地图事件
     changeMap(id){
diff --git a/src/views/components/carPopup/index.vue b/src/views/components/carPopup/index.vue
index c905666..3dd445b 100644
--- a/src/views/components/carPopup/index.vue
+++ b/src/views/components/carPopup/index.vue
@@ -1,5 +1,13 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-08-17 16:59:51
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-08-17 21:28:32
+-->
 <template>
-  <popup-title :type="3" v-on:personClose="carClose" title="车辆信息">
+  <popup-title :type="3" v-on:personClose="carClose" title="车辆信息" :style="pointLocation">
     <div class="car-main">
       <div class="car-info">
         <div class="dot"></div>
@@ -16,6 +24,10 @@ export default {
   components:{popupTitle},
   data() {
     return {
+      pointLocation:{
+        left:'',
+        right:'',
+      }
     }
   },
   methods:{
@@ -26,6 +38,27 @@ export default {
       this.$emit('carinfo')
     }
   },
+  props:{
+    point:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  mounted(){
+    this.pointLocation.left = (this.point.x + 20) + 'px';
+    this.pointLocation.top = (this.point.y - 40) + 'px'
+  },
+  watch:{
+    point:{
+      handler(newobj,oldobj) {
+        this.pointLocation.left = (newobj.x + 20) + 'px';
+        this.pointLocation.top = (newobj.y - 40) + 'px'
+      },
+      deep:true,
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/components/eventPopup/index.vue b/src/views/components/eventPopup/index.vue
index 42dc4e6..c7dcbd5 100644
--- a/src/views/components/eventPopup/index.vue
+++ b/src/views/components/eventPopup/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <popup-title :type="2" v-on:personClose="eventClose" title="事件信息">
+  <popup-title :type="2" v-on:personClose="eventClose" title="事件信息" :style="pointLocation">
     <div class="event-main">
       <div class="event-info">
         <div class="dot"></div>
@@ -36,6 +36,10 @@ export default {
       mypopupTitle:{
         width:'242px',
         height:"224px",
+      },
+      pointLocation:{
+        left:'',
+        right:'',
       }
     }
   },
@@ -47,6 +51,27 @@ export default {
       this.$emit('zhipai')
     }
   },
+  props:{
+    point:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  mounted(){
+    this.pointLocation.left = (this.point.x + 20) + 'px';
+    this.pointLocation.top = (this.point.y - 40) + 'px'
+  },
+  watch:{
+    point:{
+      handler(newobj,oldobj) {
+        this.pointLocation.left = (newobj.x + 20) + 'px';
+        this.pointLocation.top = (newobj.y - 40) + 'px'
+      },
+      deep:true,
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/components/mapLeftNumber/index.vue b/src/views/components/mapLeftNumber/index.vue
index 6b65151..83b91bd 100644
--- a/src/views/components/mapLeftNumber/index.vue
+++ b/src/views/components/mapLeftNumber/index.vue
@@ -20,7 +20,7 @@
           </div>
           <div class="route-track">
             <img src="@/assets/images/track.png" alt="">
-            <span>形成轨迹</span>
+            <span>行程轨迹</span>
           </div>
         </div>
       </div>
diff --git a/src/views/components/monitoringPopup/index.vue b/src/views/components/monitoringPopup/index.vue
index 96ab5d4..4b2c8da 100644
--- a/src/views/components/monitoringPopup/index.vue
+++ b/src/views/components/monitoringPopup/index.vue
@@ -1,5 +1,13 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-08-17 17:14:00
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-08-17 21:28:08
+-->
 <template>
-  <popup-title :type="4" v-on:personClose="monitoringClose" title="监控视频">
+  <popup-title :type="4" v-on:personClose="monitoringClose" title="监控视频" :style="pointLocation">
     <div class="monitoring">
       <div class="bg">
         <img src="@/assets/images/popup/screenshot20230817.png" alt="">
@@ -17,6 +25,10 @@ export default {
   components:{popupTitle},
   data() {
     return {
+      pointLocation:{
+        left:'',
+        right:'',
+      }
     }
   },
   methods:{
@@ -27,6 +39,27 @@ export default {
       this.$emit('monitoringInfo')
     }
   },
+  props:{
+    point:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  mounted(){
+    this.pointLocation.left = (this.point.x + 20) + 'px';
+    this.pointLocation.top = (this.point.y - 40) + 'px'
+  },
+  watch:{
+    point:{
+      handler(newobj,oldobj) {
+        this.pointLocation.left = (newobj.x + 20) + 'px';
+        this.pointLocation.top = (newobj.y - 40) + 'px'
+      },
+      deep:true,
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/components/personPopup/index.vue b/src/views/components/personPopup/index.vue
index aa68b15..1dce7f1 100644
--- a/src/views/components/personPopup/index.vue
+++ b/src/views/components/personPopup/index.vue
@@ -4,10 +4,10 @@
  * @Author: JC9527
  * @Date: 2023-08-17 15:43:51
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-17 17:47:57
+ * @LastEditTime: 2023-08-17 21:27:22
 -->
 <template>
-  <div class="person-popup">
+  <div class="person-popup" :style="pointLocation">
     <div class="popup-title">
       <div class="title">人员信息</div>
       <div class="mask" @click="close()"></div>
@@ -31,6 +31,10 @@
 export default {
   data() {
     return {
+      pointLocation:{
+        left:'',
+        right:'',
+      }
     }
   },
   methods:{
@@ -41,6 +45,27 @@ export default {
       this.$emit('getRoute')
     }
   },
+  props:{
+    point:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  mounted(){
+    this.pointLocation.left = (this.point.x + 20) + 'px';
+    this.pointLocation.top = (this.point.y - 40) + 'px'
+  },
+  watch:{
+    point:{
+      handler(newobj,oldobj) {
+        this.pointLocation.left = (newobj.x + 20) + 'px';
+        this.pointLocation.top = (newobj.y - 40) + 'px'
+      },
+      deep:true,
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>