From 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 Jan 2022 10:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/mobileLeftNav/index.vue |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/mobileLeftNav/index.vue b/src/components/mobileLeftNav/index.vue
index 5f84749..e584f72 100644
--- a/src/components/mobileLeftNav/index.vue
+++ b/src/components/mobileLeftNav/index.vue
@@ -45,7 +45,7 @@
     },
   },
   computed: {
-    ...mapGetters(["iconHide"]),
+    ...mapGetters(["iconHide", "dimensionData"]),
   },
   data() {
     return {
@@ -169,6 +169,7 @@
       this.$store.commit("MSET_ICONHIDE", !isif);
     },
     leftNavClick(item) {
+      // console.log(123132);
       //判断并关闭已开启标签
       let lnd = this.leftNavData;
       for (let k in lnd) {
@@ -190,7 +191,7 @@
         item.img = item.checked;
         this[item.layer].show = true;
         // console.log("飞入");
-        this.flyTo(item);
+        // this.flyTo(item);
         this.$store.dispatch("closeMobileWindowsDom"); //关闭弹窗
       } else {
         item.img = item.normal;
@@ -198,16 +199,29 @@
       }
     },
     flyTo(item) {
+      let that = this;
       let posi = this[item.layer].positions[0];
       // console.log(posi);
+      let lntLat =
+        that.dimensionData.pitch == -45
+          ? [posi.lng + 0.00917, posi.lat - 0.0188, 500]
+          : [posi.lng + 0.01197, posi.lat - 0.00055, 500];
+      // that.mviewer.camera.flyTo({
+      //   destination: Cesium.Cartesian3.fromDegrees(
+      //     lntLat[0],
+      //     lntLat[1],
+      //     lntLat[2]
+      //   ),
+      // });
+      // return;
       this.$store.dispatch("mapFlyTo", {
         //飞入
-        lntLat: [posi.lng + 0.00917, posi.lat - 0.0188, 2100],
+        lntLat: lntLat,
         // lntLat: [posi.lng + 0.01187, posi.lat - 0.0308, 4000],
         // lntLat: [121.50492752204283, 31.21567802276832, 2530],
-        heading: 0,
-        pitch: -45,
-        roll: 0,
+        heading: that.dimensionData.heading,
+        pitch: that.dimensionData.pitch,
+        roll: that.dimensionData.roll,
         noOpen: true,
       });
     },
@@ -395,7 +409,7 @@
 };
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 .m-left-nav {
   position: fixed;
   bottom: 30px;

--
Gitblit v1.9.3