From 62b4b7af6fb8dea23cf14b0709156871a3c144af Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 23 六月 2026 14:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/energyManagement/meterCollection/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/energyManagement/meterCollection/index.vue b/src/views/energyManagement/meterCollection/index.vue
index 8b2636b..9f62282 100644
--- a/src/views/energyManagement/meterCollection/index.vue
+++ b/src/views/energyManagement/meterCollection/index.vue
@@ -12,7 +12,7 @@
<el-row :gutter="20" style="margin-bottom: 15px;">
<el-col :span="24">
<el-button @click="addTestData" type="primary" size="small">娣诲姞娴嬭瘯鏁版嵁</el-button>
- <el-button @click="clearData" type="danger" size="small">娓呯┖鏁版嵁</el-button>
+ <el-button @click="clearData" type="danger" size="small" v-hasPermi="['energyManagement:meterCollection:remove']">娓呯┖鏁版嵁</el-button>
<el-button @click="testChart" type="success" size="small">娴嬭瘯鍥捐〃</el-button>
</el-col>
</el-row>
@@ -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