Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2026-03-09 e82c8c9c6c3072c5b8e8d1ff4b8422825765c1f7

 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
    },