From e40ee62d3e9b71ffe3432d32a53a00c4097b5708 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:03:28 +0800
Subject: [PATCH] +3d  2.5d

---
 src/components/campusNav/index.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/components/campusNav/index.vue b/src/components/campusNav/index.vue
index f9ab156..09370d2 100644
--- a/src/components/campusNav/index.vue
+++ b/src/components/campusNav/index.vue
@@ -6,7 +6,7 @@
              :class="{'move': moveFlag}">
             <div class="title">
                 <img class="icon deblurring"
-                     src="/img/icon/jg.png"
+                     src="/img/icon/xndh.png"
                      alt="">
                 <span>
                     校内导航
@@ -51,7 +51,7 @@
                 </div>
                 <div>
                     <el-button @click="startNavigation"
-                               type="danger">导航</el-button>
+                               type="primary">导航</el-button>
                 </div>
             </div>
         </div>
@@ -73,21 +73,17 @@
             routeLayer: null
         }
     },
-    props: {
-        comeName: {
-            type: String
-        },
-        getToName: {
-            type: String
-        }
-    },
     computed: {
         ...mapGetters([
             'viewer',
             // 起点
             'startingPoint',
             // 终点
-            'terminus'
+            'terminus',
+            // 出发名称
+            'getToName',
+            // 到达名称
+            'comeName'
         ])
     },
     created () {
@@ -140,14 +136,26 @@
                 document.onmouseup = null
             }
         },
+
         closeModel () {
-            this.$parent.closeCampusNav()
+            if (this.$route.path.indexOf('/campusnavi') != -1) {
+                this.$store.dispatch('delVisitedViews', this.$route)
+                this.$router.push('/pcLayout/default')
+            }
+
+            this.$store.commit('SET_COMENAME', '')
+            this.$store.commit('SET_TERMINUS', null)
+            this.$store.commit('SET_GETTONAME', '')
+            this.$store.commit('SET_STARTINGPOINT', null)
+            this.$store.commit('SET_CAMPUSNAVFLAG', false)
         },
+
         tabClick (param) {
             this.navigationWay = param
             this.tabOneFlag = !this.tabOneFlag
             this.tabTwoFlag = !this.tabTwoFlag
         },
+
         startNavigation () {
             if (this.routeLayer == null) {
                 this.routeLayer = new this.DC.VectorLayer('navigation')
@@ -231,6 +239,7 @@
                 })
             }
         },
+
         clearLayer () {
             if (this.routeLayer != null) {
                 this.routeLayer.clear()
@@ -258,7 +267,7 @@
         width: 100%;
         height: 36px;
         line-height: 36px;
-        background-color: #020c17;
+        background-color: #2196f3;
 
         .title {
             padding-left: 10px;
@@ -286,6 +295,7 @@
             margin: auto;
             width: 14px;
             height: 14px;
+            cursor: pointer;
         }
     }
 

--
Gitblit v1.9.3