首页列表增加信号

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 )}`
+}

web/src/views/HandDevice/Home/components/services/popup.service.ts

@@ -51,6 +51,7 @@ export class PopupService {
 
       <div>类型：${markerData.gasChemical}</div>
       <div>数值：${markerData.value} ${markerData.unit ? markerData.unit : ''}</div>
+      <div>信号：${markerData.sig}</div>
       <div>时间：${markerData.timeStr ? markerData.timeStr : '-'} </div>
       <div>
         坐标：${markerData.coordinates[0].toFixed(6)}, ${markerData.coordinates[1].toFixed(6)}/${markerData.gpsType===0?"GPS":"基站"}

web/src/views/HandDevice/Home/index.vue

@@ -55,6 +55,9 @@
 
               <div><span>电量：</span>{{ item.battery }}</div>
               <div><span>数值：</span>{{ item.value }} {{ item.unit }}</div>
+               
+              <div><span>信号：</span>{{ item.sig }}</div> 
+
               <div><span>时间：</span>{{ item.timeStr }}</div>
 
               <div style="margin-top: 10px">

web/src/views/gas/tdengine/index.vue

@@ -118,8 +118,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column type="selection" width="55" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="false">
+      <!-- <el-table-column type="selection" width="55" /> -->
       <el-table-column label="持有人" align="center" prop="name">
         <!-- <template #default="scope">
           {{
@@ -128,11 +128,14 @@
           }}
         </template> -->
       </el-table-column>
-      <el-table-column label="设备编号" align="center" prop="sn" />
+      <el-table-column label="设备编号" align="center" prop="sn"   width="150"/>
       <el-table-column label="经度" align="center" prop="longitude" />
       <el-table-column label="纬度" align="center" prop="latitude" />
       <el-table-column label="气体数值" align="center" prop="value" />
       <el-table-column label="电量" align="center" prop="battery" />
+      <el-table-column label="信号" align="center" prop="sig"  width="160"/>
+      <el-table-column label="内存(KB)" align="center" prop="mem" :formatter="formatByte"  width="90" />
+      <el-table-column label="开机(秒)" align="center" prop="boot"  width="90" />
 
       <!-- <el-table-column label="气体类型" align="center" prop="gasType"></el-table-column> -->
       <!-- <el-table-column label="首报值" align="center" prop="vAlarmFirst" />
@@ -157,7 +160,7 @@
         align="center"
         prop="ts"
         :formatter="dateFormatter"
-        width="180px"
+        width="160px"
       />
     </el-table>
     <!-- 分页 -->
@@ -181,6 +184,8 @@
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
+import { formatByte } from '@/utils/formatter'
+
 
 import { tdengineApi, tdStruct, tdQuery } from '@/api/gas/tdengine/index'
 // import HandAlarmForm from './HandAlarmForm.vue'