From 931aebc875a4d927aae21a36250e2008616c02e4 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 01 九月 2025 16:19:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_erjitaocan' into dev
---
src/views/energyManagement/meterCollection/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/energyManagement/meterCollection/index.vue b/src/views/energyManagement/meterCollection/index.vue
index 8b2636b..dfa5617 100644
--- a/src/views/energyManagement/meterCollection/index.vue
+++ b/src/views/energyManagement/meterCollection/index.vue
@@ -227,7 +227,7 @@
power: '75.5',
powerFactor: '0.85',
status: '姝ｅ父',
- lastUpdateTime: '2024-01-15 10:30:00'
+ lastUpdateTime: '2025-01-15 10:30:00'
},
{
id: 2,
@@ -241,7 +241,7 @@
power: '45.2',
powerFactor: '0.92',
status: '姝ｅ父',
- lastUpdateTime: '2024-01-15 10:25:00'
+ lastUpdateTime: '2025-01-15 10:25:00'
}
]
this.pagination.total = this.meterList.length
@@ -408,7 +408,7 @@
power: '50.0',
powerFactor: '0.85',
status: '姝ｅ父',
- lastUpdateTime: '2024-01-15 12:00:00'
+ lastUpdateTime: '2025-01-15 12:00:00'
}
this.detailDialogVisible = true
},
--
Gitblit v1.9.3