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

shuishen

2021-12-23 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0

 src/mobileDivForms/mobileDivForms.js

@@ -86,8 +86,20 @@
        el.addClass(className || '')

        $('#mobile-map_popup_content').append(el)
        // let time;
        // function cons(e) {
        //     time = setTimeout(() => {
        //         console.log(e)
        //         console.log(e.sun._drawingBufferHeight)
        //         console.log("roll: ", e.camera.roll)
        //         console.log("pitch: ", e.camera.pitch)
        //         console.log("heading: ", e.camera.heading)
        //         clearTimeout(time);
        //         time = "";
        //     }, 2000);
        // }

        this._viewer.scene.postRender.addEventListener(function () {
        this._viewer.scene.postRender.addEventListener(function (e) {
            if (!self.isOpen) {
                return;
            }
@@ -95,7 +107,7 @@
                self._viewer.scene,
                position
            )

            // time || cons(e);
            self.positionPopUp(windowCoord, id)
        })
    }
@@ -104,6 +116,7 @@
        if (!windowCoord) {
            return;
        }
        // console.log(windowCoord)
        const wx = document.getElementById('app').clientWidth;
        const x = windowCoord.x - (wx / 100 * 35);
        const y = windowCoord.y - document.getElementById(id).offsetHeight - 15;