Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-01-04 1b560b7103c3b4874c2cfd42ca2a29d3b9f61cba

 src/store/modules/mobile.js

@@ -110,6 +110,8 @@
    // },
    //切换2D和2.5D
    MSET_DIMENSION(state, data) {
      //关闭弹窗

      //3d，2.5d转换事件
      state.dimension = data;
      if (data == "3D") {
@@ -132,13 +134,13 @@
        // state.mviewer.flyTo(state.tileset);

        //3D视角不限制
        state.mviewer.scene.screenSpaceCameraController.minimumZoomDistance = 100;
        state.mviewer.scene.screenSpaceCameraController.minimumZoomDistance = 80;
        // 最大
        state.mviewer.scene.screenSpaceCameraController.maximumZoomDistance = 4000000;
        // 设置相机缩小时的速率
        state.mviewer.scene.screenSpaceCameraController._minimumZoomRate = 3000;
        state.mviewer.scene.screenSpaceCameraController._minimumZoomRate = 10000;
        // 设置相机放大时的速率
        state.mviewer.scene.screenSpaceCameraController._maximumZoomRate = 3000;
        state.mviewer.scene.screenSpaceCameraController._maximumZoomRate = 5906376272000;
        // 视角平移
        state.mviewer.scene.screenSpaceCameraController.enableRotate = true;
        // 视角缩放
@@ -154,7 +156,7 @@
        };
        state.tilesetLayer.show = false; //隐藏3d图形
        state.newLayer = state.usetowpointfive(); //添加2.5d图形贴片
        state.wallLayer.show = true; //打开瀑布
        state.wallLayer.show = false; //打开瀑布
        state.startPointFn(); //移动默认视角

        //2.5D视角限制
@@ -193,8 +195,6 @@
    },
    setMobileWindows({ state, commit, dispatch }, data) {
      // 打开随地图移动窗口
      // 关闭前一个弹窗？
      dispatch("closeMobileWindowsDom");
      let clas, Flys;
      const nowHeight = Math.ceil(
        state.mviewer.camera.positionCartographic.height
@@ -440,6 +440,8 @@
      // console.log(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
    },
    MSET_DIMENSIONS({ state, commit, dispatch }, val) {
      //关闭弹窗
      dispatch("closeMobileWindowsDom");
      //3d，2.5d转换事件
      commit("MSET_DIMENSION", val);
      //控制高度