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

shuishen

2021-12-30 f123daae62d76214dff2a3c77439339030d7e60a

 src/store/modules/mobile.js

@@ -28,6 +28,10 @@
            checked: "/img/leftnav/way-checked.png",
            layer: "pointLayer",
        },
        //默认起始点函数
        startPointFn: '',
        dimension: "2D",// 维度
        perspectiveControl: '',//视角控制：高度、角度  ()=>{}
    },
    mutations: {
        MSET_VIEWER(state, viewer) {
@@ -75,6 +79,10 @@
            state.MobileWindowsHideFixed = viewer
            console.log(state.MobileWindowChangeDataFixed);
        },
        //默认位置
        MSET_MORENWEIZHI(state, data) {
            state.startPointFn = data;
        },
        //开关飞入点图标
        MSET_OPENPOINTEL(state, val) {
            if (val) {
@@ -84,6 +92,14 @@
                state.pointLayerData.img = state.pointLayerData.normal;
                state[state.pointLayerData.layer].show = false;
            }
        },
        //切换2D和2.5D
        MSET_DIMENSION(state, data) {
            state.dimension = data;
        },
        //切换控制
        MSET_PERSPECTIVECONTROL(state, data) {
            state.perspectiveControl = data;
        }
    },
    actions: {
@@ -94,16 +110,42 @@
        setMobileWindows({ state, commit, dispatch }, data) {//打开随地图移动窗口
            // 关闭前一个弹窗？
            dispatch("closeMobileWindowsDom");
            let clnt = data.from == "PopupOurOnce" ? +data.lntLat[0] : +data.lntLat[0],
                clat = data.from == "PopupOurOnce" ? +data.lntLat[1] - 0.00008 : +data.lntLat[1] - 0.00048,
                calt = data.from == "PopupOurOnce" ? 0 : 90.648862227;
            let clas, Flys;

            if (state.dimension == "2D") {
                Flys = [
                    +data.lntLat[0] + 0.01197,
                    +data.lntLat[1] - 0.0001,
                    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,
                ]

            } else if (state.dimension == "2.5D") {
                Flys = [
                    +data.lntLat[0] + 0.01197,
                    +data.lntLat[1] - 0.0022,
                    330,
                ]
                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,
                ]
            }


            if (data.useJWD) {
                var ellipsoid = state.mviewer.scene.globe.ellipsoid;
                var cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
                    // data.lntLat[0],
                    // data.lntLat[1] - 0.00048,//数值增大是下
                    // "90.648862227"
                    clnt, clat, calt
                    // clnt, clat, calt
                    ...clas
                );
                data.position = ellipsoid.cartographicToCartesian(cartographic);
            }
@@ -134,18 +176,21 @@
            // h：330
            // lnt： + 0.01197 x轴
            // Lat: - 0.0021 y轴
            let Flys = [
                data.from == "PopupOurOnce" ? +data.lntLat[0] + 0.01197 : +data.lntLat[0] + 0.01197,
                data.from == "PopupOurOnce" ? +data.lntLat[1] - 0.0021 : +data.lntLat[1] - 0.0021,
                data.from == "PopupOurOnce" ? 330 : 330,
            ]
            // console.log(data.query.from, 78)
            // let Flys = [
            //     data.query.from == "地图点击" ? +data.lntLat[0] + 0.01197 : +data.lntLat[0] + 0.01197,
            //     data.query.from == "地图点击" ? +data.lntLat[1] - 0.0021 : +data.lntLat[1] - 0.0021,
            //     data.query.from == "地图点击" ? 330 : 330,
            // ]


            let Position = new global.DC.Position(//转坐标
                // +data.lntLat[0] + 0.01197,
                // +data.lntLat[1] - 0.0021,
                // 330,
                ...Flys,
                0,
                -45
                state.dimension == "2D" ? -90 : state.dimension == "2.5D" ? -45 : -45
            );
            dispatch("mapFlyTo", {//飞入
                lntLat: [Position.lng, Position.lat, Position.alt],
@@ -210,6 +255,11 @@
                },
                duration: 1.6,   //定位的时间间隔
                complete: () => {//完成后的回调
                    if (data.fn) {//自定义回调
                        setTimeout(() => {
                            data.fn()
                        }, 500);
                    }
                    if (!data.noOpen) {
                        setTimeout(() => {
                            // dispatch("MSET_POINTDATA", data.lntLat);//传入标记点
@@ -275,6 +325,14 @@
            state.pointLayer.addOverlay(billboard); //实景
            // commit("MSET_OPENPOINTEL", true);
        },
        MSET_LOCKPERSPECTIVEL({ state, commit, dispatch }, val) {
            //锁定
            state.mviewer.camera.lookAtTransform(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
            // console.log(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
        },
        MSET_DIMENSIONS({ state, commit, dispatch }, val) {
            commit("MSET_DIMENSION", val);
        }
    }
}