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

shuishen

2021-12-23 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0

 src/store/modules/mobile.js

@@ -14,6 +14,7 @@
        popupsDom: '',//mobileDivForms的实体类
        query: {},//传输数据
        openmobileGoTo: false,//测试
        ccDataState: false,//测试
        openmobilePanorama: false,//实景显影
        MobileWindowsHideFixed: true,//改变点击窗口的显示状态--固定窗口
        MobileWindowChangeDataFixed: false,//改变点击窗口的数据--固定窗口
@@ -53,6 +54,10 @@
            state.MobileWindowChangeData = !state.MobileWindowChangeData;
            state.MobileWindowsHide = viewer
        },
        MSETCC_SETCC(state, viewer) {
            state.ccDataState = !state.ccDataState;//专门测试
            state.query = viewer;
        },
        MSET_POPUPDOM(state, viewer) {
            state.popupsDom = viewer
        },
@@ -89,12 +94,16 @@
        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;
            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"
                    // data.lntLat[0],
                    // data.lntLat[1] - 0.00048,//数值增大是下
                    // "90.648862227"
                    clnt, clat, calt
                );
                data.position = ellipsoid.cartographicToCartesian(cartographic);
            }
@@ -121,11 +130,20 @@
            // Lat: - 0.0108 y轴 减是上
            // h：4000
            // lnt： + 0.01187 x轴
            // Lat: - 0.0308y轴
            // Lat: - 0.0308 y轴
            // 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,
            ]
            let Position = new global.DC.Position(//转坐标
                +data.lntLat[0] + 0.01197,
                +data.lntLat[1] - 0.0021,
                330,
                // +data.lntLat[0] + 0.01197,
                // +data.lntLat[1] - 0.0021,
                // 330,
                ...Flys,
                0,
                -45
            );