From 5f9bf98779e2c3e69324d75849efdda00868da4f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 29 五月 2026 15:45:47 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
admin/src/views/business/ywconditionermeter.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/ywconditionermeter.vue b/admin/src/views/business/ywconditionermeter.vue
index 392aa24..0e7ceb5 100644
--- a/admin/src/views/business/ywconditionermeter.vue
+++ b/admin/src/views/business/ywconditionermeter.vue
@@ -27,14 +27,20 @@
<el-table-column prop="dbName" label="鐢佃〃鍚嶇О" min-width="130" align="center" show-overflow-tooltip />
<el-table-column prop="dbAdr" label="琛ㄥ湴鍧�" min-width="120" align="center" show-overflow-tooltip />
<el-table-column prop="wgMac" label="缃戝叧MAC" min-width="140" align="center" show-overflow-tooltip />
+ <el-table-column label="澶氳仈鏈篗AC" min-width="180" align="center" show-overflow-tooltip>
+ <template slot-scope="{ row }">{{ formatNum(row.dljMac) }}</template>
+ </el-table-column>
+ <el-table-column label="娉㈢壒鐜�" min-width="80" align="center">
+ <template slot-scope="{ row }">{{ formatNum(row.btl) }}</template>
+ </el-table-column>
+ <el-table-column label="鏄惁鏍¢獙" min-width="100" align="center">
+ <template slot-scope="{ row }">{{ formatJy(row.jy) }}</template>
+ </el-table-column>
<el-table-column prop="dbBb" label="鍙樻瘮" min-width="80" align="center" />
<el-table-column prop="xyName" label="鍗忚" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="standbyShare" label="寰呮満鍒嗘憡" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="outdoorLoop" label="澶栨満鍥炶矾" min-width="90" align="center" />
- <el-table-column label="鍔熺巼(kW)" min-width="100" align="center">
- <template slot-scope="{ row }">{{ formatNum(row.powerKw) }}</template>
- </el-table-column>
- <el-table-column label="绱鐢甸噺" min-width="110" align="center">
+ <el-table-column label="绱鐢佃兘" min-width="110" align="center">
<template slot-scope="{ row }">{{ formatNum(row.totalDl) }}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="160" align="center" fixed="right">
@@ -122,6 +128,10 @@
if (val === null || val === undefined || val === '') return '-'
return val
},
+ formatJy (val) {
+ if (val === null || val === undefined || val === '') return '-'
+ return Number(val) === 1 ? '1-鏍¢獙' : '0-鏃犳牎楠�'
+ },
handleSync () {
this.$dialog.actionConfirm('纭浠庢櫤绮剧伒骞冲彴鍚屾鍏ㄩ儴鐢佃〃鍚楋紵', '鍚屾鐢佃〃')
.then(() => {
@@ -141,8 +151,8 @@
this.operateType = 'energy'
meterApi.queryEnergy(row.id)
.then(res => {
- this.$tip.apiSuccess(res || '鏌ョ數閲忚姹傚凡鎻愪氦')
- this.handlePageChange()
+ this.$tip.apiSuccess(res || '鏌ョ數閲忔垚鍔�')
+ this.search()
})
.catch(e => this.$tip.apiFailed(e))
.finally(() => {
@@ -155,8 +165,8 @@
this.operateType = 'power'
meterApi.queryPower(row.id)
.then(res => {
- this.$tip.apiSuccess(res || '鏌ュ姛鐜囪姹傚凡鎻愪氦')
- this.handlePageChange()
+ this.$tip.apiSuccess(res || '鏌ュ姛鐜囨垚鍔�')
+ this.search()
})
.catch(e => this.$tip.apiFailed(e))
.finally(() => {
--
Gitblit v1.9.3