fix: eew overlaying other panels

ExpTechTW · Feb 5, 2024 · 9111658 · 9111658
1 parent cd7a7c9
commit 9111658
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/components/component/MapHomeViewControl.vue b/src/components/component/MapHomeViewControl.vue
@@ -10,8 +10,8 @@ const props = defineProps<{
 
 onMounted(() => {
   props.map.fitBounds(TaiwanBounds, {
-    padding: { top: 16, right: 16, bottom: 16, left: 32 },
-    duration: 300,
+    padding: { top: 16, right: 316, bottom: 16, left: 32 },
+    duration: 200,
   });
 });
 </script>

diff --git a/src/components/view/MapView.vue b/src/components/view/MapView.vue
@@ -252,13 +252,13 @@ onUnmounted(() => {
     MapReportListMarker(:map="map", :reports="reports")
   .active-report(v-if="activeReport && currentView == 'report'")
     MapReportMarker(:map="map", :report="activeReport")
-  .rts(v-if="stations")
+  .rts(v-if="stations && currentView == 'home'")
     MapRtsMarker(:map="map", :stations="stations", :rts="rts")
   .rts-box(v-if="Object.keys(rts.value.box).length")
     MapRtsBox(:map="map", :box="rts.value.box")
-  .eew(v-if="Object.keys(eew).length")
+  .eew(v-if="Object.keys(eew).length&& currentView == 'home'")
     MapEew(:map="map", :eew="eew")
-  .eew-town-intensity(v-if="currentEewIndex.value")
+  .eew-town-intensity(v-if="currentEewIndex.value&& currentView == 'home'")
     MapEewIntensity(:map="map", :int="eew[currentEewIndex.value].int")
 </template>
 

diff --git a/src/main.ts b/src/main.ts
@@ -182,7 +182,7 @@ api.on(WebSocketEvent.Close, console.debug);
 const getAccurateTime = () => {
   return ntp.value.server + (Date.now() - ntp.value.client);
 };
-/* 
+
 setTimeout(() => {
   const eew = {
     type: "eew",
@@ -207,4 +207,3 @@ setTimeout(() => {
 
   api.emit(WebSocketEvent.Eew, eew);
 }, 10000);
- */