From b41db64b0dc4c5fecb40caf788a1a80e7e4e7eb5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 15:24:15 +0800
Subject: [PATCH] +

---
 src/store/modules/mobile.js |   83 +++++++++++++++++++++++++++++------------
 1 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index e77d54a..8373b0d 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -38,6 +38,12 @@
         },
         perspectiveControl: '',//视角控制:高度、角度  ()=>{}
         perspectiveControls: '',//视角控制:高度、角度  ()=>{}
+
+        tilesetLayer: null,//3d模型
+        tileset: null,//3d模型
+        tilesetLayer: null,//2.5d模型
+        usetowpointfive: null,
+        tilesetLayer: null,//瀑布流
     },
     mutations: {
         MSET_VIEWER(state, viewer) {
@@ -89,31 +95,45 @@
         MSET_MORENWEIZHI(state, data) {
             state.startPointFn = data
         },
-        // 开关飞入点图标
-        MSET_OPENPOINTEL(state, val) {
-            if (val) {
-                state.pointLayerData.img = state.pointLayerData.checked
-                state[state.pointLayerData.layer].show = true
-            } else {
-                state.pointLayerData.img = state.pointLayerData.normal
-                state[state.pointLayerData.layer].show = false
-            }
-        },
+        // // 开关飞入点图标
+        // MSET_OPENPOINTEL(state, val) {
+        //     if (val) {
+        //         state.pointLayerData.img = state.pointLayerData.checked
+        //         state[state.pointLayerData.layer].show = true
+        //     } else {
+        //         state.pointLayerData.img = state.pointLayerData.normal
+        //         state[state.pointLayerData.layer].show = false
+        //     }
+        // },
         //切换2D和2.5D
-        MSET_DIMENSION(state, data) {
+        MSET_DIMENSION(state, data) {//3d,2.5d转换事件
             state.dimension = data;
-            if (data == "2D") { // 改数据为3d数据
+            if (data == "3D") { // 改数据为3d数据
                 state.dimensionData = {// 维度镜头数据
                     heading: 0,
-                    pitch: -90,
+                    pitch: -45,
                     roll: 0
                 };
+                // console.log(1321)
+                state.wallLayer.show = false; //关闭瀑布   以及2.5d图形贴片
+                state.mviewer.imageryLayers.remove(state.newLayer);
+                state.newLayer = null;
+                // state.silhouetteBlue.selected = []
+                state.tilesetLayer.changesilhouetteBlue(); //清空silhouetteBlue.selected = [];
+                // console.log(state.tileset)
+                state.tilesetLayer.show = true; //显示3d图形
+                state.startPointFn();//移动默认视角
+                // state.mviewer.flyTo(state.tileset);
             } else if (data == "2.5D") {
                 state.dimensionData = {// 维度镜头数据
                     heading: 0,
                     pitch: -90,
                     roll: 0
                 };
+                state.tilesetLayer.show = false//隐藏3d图形
+                state.newLayer = state.usetowpointfive();//添加2.5d图形贴片
+                state.wallLayer.show = true//打开瀑布
+                state.startPointFn();//移动默认视角
             }
         },
         //切换控制
@@ -121,6 +141,13 @@
             state.perspectiveControl = data;
             state.perspectiveControls = !state.perspectiveControls;
         },
+        MSET_MODEOLS(state, data) {
+            state.tilesetLayer = data.tilesetLayer;
+            state.newLayer = data.newLayer;
+            state.wallLayer = data.wallLayer;
+            state.tileset = data.tileset;
+            state.usetowpointfive = data.usetowpointfive;
+        }
     },
     actions: {
         MSET_CREADE({ state, commit, dispatch }) {
@@ -132,27 +159,33 @@
             dispatch("closeMobileWindowsDom");
             let clas, Flys;
             const nowHeight = Math.ceil(state.mviewer.camera.positionCartographic.height);
-            if (state.dimension == "2D") {
+            console.log(data)
+            if (state.dimension == "3D") {
                 Flys = [
                     +data.lntLat[0] + 0.01197,
-                    +data.lntLat[1] - 0.0001,
-                    nowHeight,
+                    // +data.lntLat[1] - 0.0001,
+                    +data.lntLat[1] - 0.0042,
+                    330,
                 ]
                 clas = [
                     data.from == 'PopupOurOnce' ? +data.lntLat[0] : +data.lntLat[0],
-                    data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
-                    data.from == 'PopupOurOnce' ? 0 : 0
+                    // data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
+                    data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1] - 0.00048,
+                    data.from == 'PopupOurOnce' ? 0 : 90.648862227
                 ]
             } else if (state.dimension == '2.5D') {
                 Flys = [
                     +data.lntLat[0] + 0.01197,
-                    +data.lntLat[1] - 0.0022,
-                    330
+                    +data.lntLat[1] - 0.0001,
+                    // +data.lntLat[1] - 0.0022,
+                    nowHeight
                 ]
                 clas = [
                     data.from == 'PopupOurOnce' ? +data.lntLat[0] : +data.lntLat[0],
-                    data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1] - 0.00048,
-                    data.from == 'PopupOurOnce' ? 0 : 90.648862227
+                    data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
+                    // data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1] - 0.00048,
+                    // data.from == 'PopupOurOnce' ? 0 : 90.648862227
+                    data.from == 'PopupOurOnce' ? 0 : 0
                 ]
             }
 
@@ -270,7 +303,7 @@
                     // pitch: data.pitch,
                     roll: data.roll
                 },
-                duration: 1.6, // 定位的时间间隔
+                duration: 1.5, // 定位的时间间隔
                 complete: () => { // 完成后的回调
                     if (data.fn) { // 自定义回调
                         setTimeout(() => {
@@ -347,7 +380,7 @@
             state.mviewer.camera.lookAtTransform(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
             // console.log(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
         },
-        MSET_DIMENSIONS({ state, commit, dispatch }, val) {
+        MSET_DIMENSIONS({ state, commit, dispatch }, val) {//3d,2.5d转换事件
             commit("MSET_DIMENSION", val);
             //控制高度
             const height = Math.ceil(state.mviewer.camera.positionCartographic.height);
@@ -366,7 +399,7 @@
                 },
             });
         },
-        MSET_GOTOCC({ state, commit, dispatch }, val) {
+        MSET_GOTOCC({ state, commit, dispatch }, val) {//测试移动位置
             // commit("MSET_DIMENSION", val);
             //控制高度
             // const height = Math.ceil(state.mviewer.camera.positionCartographic.height);

--
Gitblit v1.9.3