From af79682f6c5b6df8ed8d08a4c9d21ebad816fdc4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 九月 2024 15:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
public/index.html | 4 +++-
src/views/screen/index.vue | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/public/index.html b/public/index.html
index fd0af84..0d260d5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -12,7 +12,9 @@
</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
- html
+ html {
+ font-size: 14px
+ }
body,
#app {
height: 100%;
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index 2156d89..cb33bb8 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -309,6 +309,7 @@
})
.catch((err) => {
});
+ this.getData();
// 鏌ヨ鏁版嵁
this.intervalId = setInterval(this.getData, 3600000); //涓�灏忔椂涓�娆�
},
--
Gitblit v1.8.0