From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/index-index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 5f6a141..b7b059a 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -323,9 +323,9 @@
 			setInterval(() => {
 				this.nowTime()
 			}, 1000)
-			setInterval(() => {
+			/* setInterval(() => {
 				this.getDataList()
-			}, 60 * 1000)
+			}, 60 * 1000) */
 		},
 		methods: {
 			nowTime() {

--
Gitblit v1.9.3