diff --git a/web/src/utils/formatter.ts b/web/src/utils/formatter.ts index 8777f32..6d85fbc 100644 --- a/web/src/utils/formatter.ts +++ b/web/src/utils/formatter.ts @@ -5,3 +5,8 @@ import { floatToFixed2 } from '@/utils' export const fenToYuanFormat = (_, __, cellValue: any, ___) => { return `¥${floatToFixed2(cellValue)}` } + +// 格式化内存【字节转MB】 +export const formatByte = (_, __, cellValue: any, ___) => { + return `${floatToFixed2(cellValue / 1024 )}` +} diff --git a/web/src/views/HandDevice/Home/components/services/popup.service.ts b/web/src/views/HandDevice/Home/components/services/popup.service.ts index 248c271..261df91 100644 --- a/web/src/views/HandDevice/Home/components/services/popup.service.ts +++ b/web/src/views/HandDevice/Home/components/services/popup.service.ts @@ -51,6 +51,7 @@ export class PopupService {
类型:${markerData.gasChemical}
数值:${markerData.value} ${markerData.unit ? markerData.unit : ''}
+
信号:${markerData.sig}
时间:${markerData.timeStr ? markerData.timeStr : '-'}
坐标:${markerData.coordinates[0].toFixed(6)}, ${markerData.coordinates[1].toFixed(6)}/${markerData.gpsType===0?"GPS":"基站"} diff --git a/web/src/views/HandDevice/Home/index.vue b/web/src/views/HandDevice/Home/index.vue index cbebeac..e447782 100644 --- a/web/src/views/HandDevice/Home/index.vue +++ b/web/src/views/HandDevice/Home/index.vue @@ -55,6 +55,9 @@
电量:{{ item.battery }}
数值:{{ item.value }} {{ item.unit }}
+ +
信号:{{ item.sig }}
+
时间:{{ item.timeStr }}
diff --git a/web/src/views/gas/tdengine/index.vue b/web/src/views/gas/tdengine/index.vue index 63a3ab5..6c9ffa1 100644 --- a/web/src/views/gas/tdengine/index.vue +++ b/web/src/views/gas/tdengine/index.vue @@ -118,8 +118,8 @@ - - + + - + + + + @@ -181,6 +184,8 @@