电表数据同步

pages/work/db/index.vue

@@ -16,22 +16,21 @@
 						</view>
 					</view>
 				</template>
-				<view class='content' v-if="deviceIdTypeMsg[item.deviceId]">
+				<view class='content'>
 					<uni-group mode="card" class="data-card-group">
 						<uni-row v-for="(tempDataItem,tempDataIndex) in
-						deviceIdTypeMsg[item.deviceId]" :key="tempDataIndex+'dbTempData'" class="data-row">
+						(deviceIdTypeMsg[item.deviceId] || otherTypeMsg)" :key="tempDataIndex+'dbTempData'" class="data-row">
 							<uni-col :span="8">
 								<view class="title">{{tempDataItem.name}}</view>
 							</uni-col>
 							<uni-col :span="16">
 								<view class="value">{{item[tempDataItem.attr] | formatNumber}}
-									<!-- <text v-if="infoDataItem.unit" v-html="infoDataItem.unit"></text> -->
+									<text v-if="tempDataItem.unit" v-html="tempDataItem.unit"></text>
 								</view>
 							</uni-col>
 						</uni-row>
 					</uni-group>
 				</view>
-				<view v-else class='unknow-bd-device'>未知的电表数据</view>
 			</uni-collapse-item>
 		</uni-collapse>
 		<view class="no-data" v-else>
@@ -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) {