From 0fa88f9c2e3c8ce335e7cd6dfc6c8e5641950735 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 09 Feb 2022 15:53:24 +0800
Subject: [PATCH] +弹窗图片可点击,列表展示文字区域点击是定位,图片可点击,+活动打开后隐藏右侧控制栏,+操作方式更改

---
 src/components/map/index.vue |   77 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 8c895c0..dbf3aad 100644
--- a/src/components/map/index.vue
+++ b/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;
@@ -31,6 +43,7 @@
         <campusNav ref="campusNavRoute"
                    v-show="campusNavFlag" />
 
+        <search-details v-if="searchPopupFlag"></search-details>
         <org-nav-bar v-if="orgNavBarFlag"></org-nav-bar>
         <arc-nav-bar v-if="arcNavBarFlag"></arc-nav-bar>
     </div>
@@ -54,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: {
@@ -82,7 +154,8 @@
             // 社区内导航的显示关闭
             'campusNavFlag',
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     mounted () {
@@ -282,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)

--
Gitblit v1.9.3