diff --git a/pages/work/db/index.vue b/pages/work/db/index.vue index 4424bfd..6c0db1c 100644 --- a/pages/work/db/index.vue +++ b/pages/work/db/index.vue @@ -16,22 +16,21 @@ - + + (deviceIdTypeMsg[item.deviceId] || otherTypeMsg)" :key="tempDataIndex+'dbTempData'" class="data-row"> {{tempDataItem.name}} {{item[tempDataItem.attr] | formatNumber}} - + - 未知的电表数据 @@ -63,88 +62,122 @@ 'LOAD': [{ name: '正向有功电能', attr: 'forwardActive', - pointName: '正向有功电能' + pointName: '正向有功电能', + unit: 'kWh' }, { name: '反向有功电能', attr: 'reverseActive', - pointName: '反向有功电能' + pointName: '反向有功电能', + unit: 'kWh' }, { name: '正向无功电能', attr: 'forwardReactive', - pointName: '正向无功电能' + pointName: '正向无功电能', + unit: 'kvarh' }, { name: '反向无功电能', attr: 'reverseReactive', - pointName: '反向无功电能' + pointName: '反向无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ], 'METE': [{ name: '正向有功电能', attr: 'forwardActive', - pointName: '正向有功电能' + pointName: '正向有功电能', + unit: 'kWh' }, { name: '反向有功电能', attr: 'reverseActive', - pointName: '反向有功电能' + pointName: '反向有功电能', + unit: 'kWh' }, { name: '正向无功电能', attr: 'forwardReactive', - pointName: '正向无功电能' + pointName: '正向无功电能', + unit: 'kvarh' }, { name: '反向无功电能', attr: 'reverseReactive', - pointName: '反向无功电能' + pointName: '反向无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ], 'METEGF': [{ name: '有功电能', attr: 'activeEnergy', - pointName: '有功电能' + pointName: '有功电能', + unit: 'kWh' }, { name: '无功电能', attr: 'reactiveEnergy', - pointName: '无功电能' + pointName: '无功电能', + unit: 'kvarh' }, { name: '有功功率', attr: 'activePower', - pointName: '总有功功率' + pointName: '总有功功率', + unit: 'kW' }, { name: '无功功率', attr: 'reactivePower', - pointName: '总无功功率' + pointName: '总无功功率', + unit: 'kvar' } ] - } - + }, + otherTypeMsg: [{ + name: '正向有功电能', + attr: 'forwardActive', + pointName: '正向有功电能', + unit: 'kWh' + }, + { + name: '反向有功电能', + attr: 'reverseActive', + pointName: '反向有功电能', + unit: 'kWh' + }, + { + name: '有功功率', + attr: 'activePower', + pointName: '总有功功率', + unit: 'kW' + }, + ] } }, onLoad(options) {