From 3a465f7fb233eae97abd357ff5a847627c80d286 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Mar 2022 17:31:33 +0800
Subject: [PATCH] 项目部分改动
---
public/img/icon/close-video.png | 0
src/components/map/components/dimension.vue | 6 +++---
src/components/campusNav/index.vue | 6 ++++++
public/img/icon/start-video.png | 0
src/styles/pcpage/dc-ui.scss | 17 ++++++++---------
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/public/img/icon/close-video.png b/public/img/icon/close-video.png
new file mode 100644
index 0000000..0eb8268
--- /dev/null
+++ b/public/img/icon/close-video.png
Binary files differ
diff --git a/public/img/icon/start-video.png b/public/img/icon/start-video.png
new file mode 100644
index 0000000..9f53be5
--- /dev/null
+++ b/public/img/icon/start-video.png
Binary files differ
diff --git a/src/components/campusNav/index.vue b/src/components/campusNav/index.vue
index 3d17339..c6e43a2 100644
--- a/src/components/campusNav/index.vue
+++ b/src/components/campusNav/index.vue
@@ -283,6 +283,7 @@
tooltip.showAt(e.windowPosition, title)
})
},
+
closeModel () {
if (this.$route.path.indexOf('/campusnavi') != -1) {
this.$store.dispatch('delVisitedViews', this.$route)
@@ -295,6 +296,9 @@
this.comeNameText = ''
this.comeNameList = []
this.comeNameShow = false
+ this.pathBoxList = []
+ this.pathBoxShow = false
+
if (CamPusNavLayer.campusRouteLayer != null) {
CamPusNavLayer.campusRouteLayer.clear()
this.isOverRouter = false
@@ -572,6 +576,8 @@
clearLayer () {
if (CamPusNavLayer.campusRouteLayer != null) {
CamPusNavLayer.campusRouteLayer.clear()
+ this.pathBoxList = []
+ this.pathBoxShow = false
}
},
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 3ef79c3..29d8353 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -56,7 +56,7 @@
let layerSATtwo = null
let tcLayer = null
-const wallLayer = null
+// const wallLayer = null
export default {
name: 'dimension',
@@ -871,8 +871,8 @@
// 科技感删除
removeSAT () {
- global.viewer.remove(layerSat)
- global.viewer.remove(layerSATtwo)
+ global.viewer.removeLayer(layerSat)
+ global.viewer.removeLayer(layerSATtwo)
layerSat = null
layerSATtwo = null
},
diff --git a/src/styles/pcpage/dc-ui.scss b/src/styles/pcpage/dc-ui.scss
index c215072..2edbdb0 100644
--- a/src/styles/pcpage/dc-ui.scss
+++ b/src/styles/pcpage/dc-ui.scss
@@ -30,16 +30,15 @@
fill: #2196f3;
}
- .div-icon {
- .tag-entitys-box {
- animation: moveLayerIcon 0.5s linear 0;
- }
+ // .div-icon {
+ // .tag-entitys-box {
+ // animation: moveLayerIcon 0.5s linear 0;
+ // }
- .tag-entitys-box:hover {
- animation: moveLayerIcon 0.5s linear infinite;
- }
- }
-
+ // .tag-entitys-box:hover {
+ // animation: moveLayerIcon 0.5s linear infinite;
+ // }
+ // }
}
--
Gitblit v1.9.3