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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index d3b7b7c..b7b059a 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -193,7 +193,7 @@
<div class="left-2">
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩瀹㈡埛娑堣垂</p>
+ <p class="p1">鏄ㄦ棩瀹㈡埛娑堣垂</p>
<p class="p2">{{data.data1.data1}}</p>
</div>
<div class="icon">
@@ -202,7 +202,7 @@
</div>
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩瀹為檯娑堣垂</p>
+ <p class="p1">鏄ㄦ棩瀹為檯娑堣垂</p>
<p class="p2">{{data.data1.data2}}</p>
</div>
<div class="icon">
@@ -211,7 +211,7 @@
</div>
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩鎴愭湰</p>
+ <p class="p1">鏄ㄦ棩鎴愭湰</p>
<p class="p2">{{data.data1.data3}}</p>
</div>
<div class="icon">
@@ -220,7 +220,7 @@
</div>
<div class="card card-1" style="margin-right: 0;">
<div class="label">
- <p class="p1">浠婃棩瀹為檯鎴愭湰</p>
+ <p class="p1">鏄ㄦ棩瀹為檯鎴愭湰</p>
<p class="p2">{{data.data1.data4}}</p>
</div>
<div class="icon">
@@ -323,9 +323,9 @@
setInterval(() => {
this.nowTime()
}, 1000)
- setInterval(() => {
+ /* setInterval(() => {
this.getDataList()
- }, 30000)
+ }, 60 * 1000) */
},
methods: {
nowTime() {
--
Gitblit v1.9.3