From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1
---
/dev/null | 0
src/components/leftNav/index.vue | 16 ++++++++--------
src/components/map/components/mapPopup copy.vue | 3 ++-
src/components/map/components/mapPopup.vue | 5 +++++
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/public/718.zip b/public/718.zip
deleted file mode 100644
index e781605..0000000
--- a/public/718.zip
+++ /dev/null
Binary files differ
diff --git a/public/wp.zip b/public/wp.zip
deleted file mode 100644
index ff65d9e..0000000
--- a/public/wp.zip
+++ /dev/null
Binary files differ
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index 9e109af..3febdc5 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -71,14 +71,14 @@
checked: '/img/leftnav/scene-checked.png',
layer: 'leftSceneLayer'
},
- {
- flag: false,
- label: '监控',
- img: '/img/leftnav/monitor.png',
- normal: '/img/leftnav/monitor.png',
- checked: '/img/leftnav/monitor-checked.png',
- layer: 'leftMonitorLayer'
- },
+ // {
+ // flag: false,
+ // label: '监控',
+ // img: '/img/leftnav/monitor.png',
+ // normal: '/img/leftnav/monitor.png',
+ // checked: '/img/leftnav/monitor-checked.png',
+ // layer: 'leftMonitorLayer'
+ // },
{
flag: false,
label: '活动',
diff --git a/src/components/map/components/mapPopup copy.vue b/src/components/map/components/mapPopup copy.vue
index 70c8e85..90194c0 100644
--- a/src/components/map/components/mapPopup copy.vue
+++ b/src/components/map/components/mapPopup copy.vue
@@ -792,6 +792,7 @@
this.audioSynth.cancel();
this.audioFlag = false;
this.audioCourse = false;
+
}
},
},
@@ -1306,4 +1307,4 @@
width: 250px !important;
height: 250px !important;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 008becb..94c2391 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -1217,4 +1217,9 @@
padding: 0 10px;
}
}
+.introduce p {
+ padding: 0px;
+ height: 300px;
+ overflow-y: scroll;
+}
</style>
--
Gitblit v1.9.3