From d348c7bb5f1726af0974789e407039a044c7ec4e Mon Sep 17 00:00:00 2001
From: guonan <guonan201020@163.com>
Date: 星期日, 01 六月 2025 13:48:09 +0800
Subject: [PATCH] 修改
---
src/views/Screen.vue | 31 +++++++++++++++++++++++++++----
src/components/monifangzhen/schemeCard.vue | 2 +-
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/components/monifangzhen/schemeCard.vue b/src/components/monifangzhen/schemeCard.vue
index 3d1d2d1..b8e371f 100644
--- a/src/components/monifangzhen/schemeCard.vue
+++ b/src/components/monifangzhen/schemeCard.vue
@@ -14,7 +14,7 @@
<p>
鏂规鐘舵�� :
<span style="color: aquamarine">
- {{ item.result === -1 ? "鍑洪敊" : item.result || "鍒涘缓浠跨湡" }}
+ {{ item.result === "-1" ? "鍑洪敊" : item.result || "鍒涘缓浠跨湡" }}
</span>
<!-- <span style="color: aquamarine">{{ item.result || "鍒涘缓浠跨湡" }}</span> -->
<!-- <span style="color: aquamarine">{{
diff --git a/src/views/Screen.vue b/src/views/Screen.vue
index b02334a..54e829e 100644
--- a/src/views/Screen.vue
+++ b/src/views/Screen.vue
@@ -18,11 +18,17 @@
<div class="screen-widget-text">
{{ weather.now.text }} {{ weather.now.temperature + "鈩�" }}
</div>
- <div
+ <!-- <div
class="screen-widget-time screen-widget-text"
style="margin-left: 20px"
>
{{ $dayjs().format("YYYY/MM/DD HH:mm") }}
+ </div> -->
+ <div
+ class="screen-widget-time screen-widget-text"
+ style="margin-left: 20px"
+ >
+ {{ currentTime }}
</div>
</div>
<div class="screen-widget-home">
@@ -38,8 +44,26 @@
</template>
<script setup>
-import { ref, onMounted, computed, defineEmits } from "vue";
+import { ref, onMounted, computed, defineEmits,onBeforeUnmount } from "vue";
import { useRouter } from "vue-router";
+import dayjs from 'dayjs'
+
+const currentTime = ref(dayjs().format("YYYY/MM/DD HH:mm:ss"));
+
+const updateTime = () => {
+ currentTime.value = dayjs().format("YYYY/MM/DD HH:mm:ss");
+};
+
+let timer;
+
+onMounted(() => {
+ timer = setInterval(updateTime, 1000);
+});
+
+onBeforeUnmount(() => {
+ clearInterval(timer); // 閬垮厤鍐呭瓨娉勬紡
+});
+
const router = useRouter();
const bgVisible = ref(true);
const defaultCity = ref(cityData.name);
@@ -96,7 +120,6 @@
.then((response) => response.json())
.then((data) => {
weather.value = data.results[0];
- // console.log(weather.value)
});
};
function initScene() {
@@ -144,7 +167,7 @@
viewer.scene.camera.flyTo(view);
}
onMounted(() => {
- // getWeatherData()
+ getWeatherData()
});
</script>
<style lang="less" scoped>
--
Gitblit v1.9.3