From aa79676ee20e97c35dc0939185f8e2d21cc05108 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 20 Nov 2024 16:33:41 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E7=82=B9=E4=BD=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zhjs/index.vue          | 53 +-------------------
 pages/zhjs/subnvue/index.nvue | 94 +++++++++++++++++++++++++++++------
 2 files changed, 80 insertions(+), 67 deletions(-)

diff --git a/pages/zhjs/index.vue b/pages/zhjs/index.vue
index bfe7f0b..0fd65f6 100644
--- a/pages/zhjs/index.vue
+++ b/pages/zhjs/index.vue
@@ -1,59 +1,10 @@
 <template>
-  <view class="zhjs-container">
-        <u-navbar title="综合监视" :autoBack="true" :titleStyle="{
-				fontSize:'18px'
-			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
-        </u-navbar>
-        <map style="width:100vw; height:100vh;margin-top:70px" id="map" :latitude="latitude" :longitude="longitude" :markers="markers"
-            :show-location="true" scale="13" :enable-satellite="enableSatellite" theme="satellite">
-                <cover-image src="/static/tabs/dingwei.png" class="location" @click="onControlTap"></cover-image>
-        </map>
-         
-    </view>
   
 </template>
 <script>
-    export default {
-        data() {
-            return {
-                latitude: 31.52,
-                longitude: 114.76,
-                enableSatellite:true,
-                markers: [{
-                    latitude: 31.52,
-                    longitude: 114.76,
-                    iconPath: '../../static/tabs/add.png',
-                    width: "25",
-                    height: "25"
-                }],
-                dingwei: '../../static/tabs/dingwei.png'
-            }
-        },
-        methods: {
-          onControlTap(){
-            const map = uni.createMapContext("map");
-            map.moveToLocation()
-          },
-          nvueShow: function() {
-          			const subnvue = uni.getSubNVueById('drawer') // 获取nvue
-                console.log(subnvue);
-          			subnvue.show()  // 显示nvue
-          		}
-        },
-       mounted() {
-         this.nvueShow()
-       }
-    }
+    
 </script>
 
 <style lang="scss">
-   .location{
-    position: absolute;
-    width: 35px;
-    height:35px;
-    bottom: 100px;
-    left:10px;
-    background-color: #fff;
-    padding: 5px;
-   }
+  
 </style>
\ No newline at end of file
diff --git a/pages/zhjs/subnvue/index.nvue b/pages/zhjs/subnvue/index.nvue
index a3bb1f4..c7e303c 100644
--- a/pages/zhjs/subnvue/index.nvue
+++ b/pages/zhjs/subnvue/index.nvue
@@ -4,8 +4,12 @@
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
         </u-navbar>
-        <map style="width:100vw; height:100vh;margin-top:70px" id="map" :latitude="latitude" :longitude="longitude" :markers="markers"
-            :show-location="true" scale="13" :enable-satellite="enableSatellite" theme="satellite">
+        <map  :style="{
+    		height: windowHeight + 'px',
+    		top: '-' + statusBarHeight + 'px'
+    	}" id="map" ref="map" :latitude="latitude" :longitude="longitude" :markers="marker"
+            :show-location="true" scale="16.5" :enable-satellite="enableSatellite" theme="satellite" @markertap="markertap">
+
                 <cover-image src="/static/tabs/dingwei.png" class="location" @click="onControlTap"></cover-image>
         </map>
          
@@ -15,26 +19,84 @@
     export default {
         data() {
             return {
-                latitude: 31.52,
-                longitude: 114.76,
-                enableSatellite:true,
-                markers: [{
-                    latitude: 31.52,
-                    longitude: 114.76,
-                    iconPath: '../../static/tabs/add.png',
+                latitude: 31.495,
+                longitude: 114.767,
+                enableSatellite:false,
+                markers: [
+                  {
+                    latitude: 31.4954,
+                    longitude: 114.7693,
+                    iconPath: '/static/tabs/add.png',
                     width: "25",
-                    height: "25"
-                }],
-                dingwei: '../../static/tabs/dingwei.png'
+                    height: "25",
+                    id:1,
+                },
+                {
+                    latitude: 31.4951,
+                    longitude: 114.767,
+                    iconPath: '/static/tabs/add.png',
+                    width: "25",
+                    height: "25",
+                    id:2,
+                }
+                ],
+                dingwei: '../../static/tabs/dingwei.png',
+                map:null,
+                windowHeight:0,
+                windowHeight:0
             }
         },
+        created() {
+          let that = this;
+          			uni.getSystemInfo({
+          				success(res) {
+          					that.windowHeight = res.windowHeight;
+          					that.windowHeight = res.windowHeight + res.statusBarHeight;
+          					that.statusBarHeight = res.statusBarHeight;
+          					that.navTop = res.statusBarHeight + 10;
+          				}
+          			})
+        },
+        onReady() {
+          this.map = uni.createMapContext("map")
+        },
         methods: {
           onControlTap(){
-            const map = uni.createMapContext("map");
-            map.moveToLocation()
+            this.$refs.map.moveToLocation({
+              latitude: 31.495,
+              longitude: 114.767
+            })
+          },
+          markertap(e){
+            const newMarker = this.markers
+            newMarker.forEach(((item,i) => {
+              if(item.id === e.detail.markerId){
+                item.height=55;
+                item.width=55;
+                item.label={
+                  content:"测试",
+                  color:"#57a7f0",
+                  bgColor:"transparent"
+                }
+              }else{
+                item.height=25;
+                item.width=25;
+               item.label={
+                 content:" ",
+                 bgColor:"transparent"
+               }
+              }
+            }));
+            console.log("newMarker",newMarker);
+            this.markers = [...newMarker];
           }
         },
-    }
+        computed:{
+          marker(){
+          return this.markers.slice(0)
+          }
+        }
+ }
 </script>
 
 <style lang="scss">
@@ -42,7 +104,7 @@
     position: absolute;
     width: 35px;
     height:35px;
-    bottom: 100px;
+    bottom: 130px;
     left:10px;
     background-color: #fff;
     padding: 5px;