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

liuyg

2022-02-08 5db837aa2d6aef6455c017d8ce58f235dde339fe

 src/components/map/index.vue

@@ -4,6 +4,18 @@
         style="height: 100%; width: 100%;"
         @click="mapClick($event)">

        <video id="video"
               style="position: fixed;
                visibility: hidden;"
               muted
               autoplay
               loop
               crossorigin
               controls>
            <source src="http://dc.dvgis.cn/examples/data/demo.mp4"
                    type="video/mp4" />
        </video>

        <div style="
            position: fixed;
            left: 4px;
@@ -55,6 +67,65 @@
        return {
            DC: null,
            areaLayer: null
        }
    },
    watch: {
        searchPopupFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    if (this.$route.path.indexOf('/pcLayout/default/service') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                    }

                    if (this.$route.path.indexOf('/orgnav') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                        this.$store.commit('SET_ORGNAVBARTITLE', '')
                        this.$store.commit('SET_ORGNAVBARLIST', [])
                        this.$store.commit('SET_ORGNAVBARFLAG', false)
                    }

                    if (this.orgNavBarFlag == true) {
                        this.$store.commit('SET_ORGNAVBARTITLE', '')
                        this.$store.commit('SET_ORGNAVBARLIST', [])
                        this.$store.commit('SET_ORGNAVBARFLAG', false)
                    }

                    if (this.$route.path.indexOf('/arc') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                        this.$store.commit('SET_ARCNAVBARTITLE', '')
                        this.$store.commit('SET_ARCNAVBARCODE', '')
                        this.$store.commit('SET_ARCNAVBARFLAG', false)
                    }

                    if (this.arcNavBarFlag == true) {
                        this.$store.commit('SET_ARCNAVBARTITLE', '')
                        this.$store.commit('SET_ARCNAVBARCODE', '')
                        this.$store.commit('SET_ARCNAVBARFLAG', false)
                    }
                }
            }
        },

        orgNavBarFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
                }
            }
        },

        arcNavBarFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
                }
            }
        }
    },
    computed: {
@@ -284,7 +355,7 @@
            //     name: '地形'
            // })

            // viewer.use(new that.DC.Measure())
            viewer.use(new that.DC.Measure())

            // viewer.flyToPosition(
            //     new that.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)