|
@@ -87,6 +87,7 @@ type DeviceRTDMap = Record<
|
|
|
{
|
|
|
[key: string]: number | string | undefined;
|
|
|
time?: string;
|
|
|
+ flushTime?: string;
|
|
|
}
|
|
|
>;
|
|
|
|
|
@@ -174,19 +175,19 @@ const getRealTimeData = () => {
|
|
|
endTime: devRTDUpdateTime.value,
|
|
|
});
|
|
|
|
|
|
- const isDeviceChillerUnit = activeDeviceType.value === DeviceType.冷水主机;
|
|
|
-
|
|
|
data.forEach((item) => {
|
|
|
- const { deviceId, deviceParamMapList, ...chillerUnitExtraParams } = item;
|
|
|
+ const { deviceId, deviceParamMapList, ...extraParams } = item;
|
|
|
deviceRealTimeData.value[deviceId] = {};
|
|
|
|
|
|
deviceParamMapList.forEach((paramItem) => {
|
|
|
Object.assign(deviceRealTimeData.value[deviceId], paramItem);
|
|
|
});
|
|
|
|
|
|
- if (isDeviceChillerUnit) {
|
|
|
- Object.assign(deviceRealTimeData.value[deviceId], chillerUnitExtraParams);
|
|
|
+ if (extraParams.flushTime === 'null') {
|
|
|
+ extraParams.flushTime = null;
|
|
|
}
|
|
|
+
|
|
|
+ Object.assign(deviceRealTimeData.value[deviceId], extraParams);
|
|
|
});
|
|
|
});
|
|
|
|
|
@@ -299,7 +300,7 @@ const handleDevCardClick = (devId: number, e: Event) => {
|
|
|
</div>
|
|
|
<!-- <div class="device-cop-level">中</div> -->
|
|
|
</template>
|
|
|
- <span class="device-card-header-time">{{ devRTDUpdateTime }}</span>
|
|
|
+ <span class="device-card-header-time">{{ deviceRealTimeData[item.id]?.flushTime }}</span>
|
|
|
<SvgIcon class="device-card-header-button" name="adjustment" @click="viewDevParam(item.id, $event)" />
|
|
|
</div>
|
|
|
<component
|