From 0fbc0192c78636ad7bb01a49ccc9db451a70bc9d Mon Sep 17 00:00:00 2001
From: eroter <331864945@qq.com>
Date: Thu, 13 Jun 2024 17:17:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=9A=8F=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/deviceData/ring/types.ts    |  6 +++---
 src/views/business/deviceData/ring/index.vue | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/api/business/deviceData/ring/types.ts b/src/api/business/deviceData/ring/types.ts
index ea31858..645d8bb 100644
--- a/src/api/business/deviceData/ring/types.ts
+++ b/src/api/business/deviceData/ring/types.ts
@@ -3,9 +3,9 @@ export interface RingVO {
   deviceId: string;
   deviceMode: string;
   activationTime: string;
-  heartRate: number;
-  bodyTemp: number;
-  bloodOxygen: number;
+  collectMode: string;
+  collectType: string;
+  collectValue: string;
   collectTime: string;
 }
 
diff --git a/src/views/business/deviceData/ring/index.vue b/src/views/business/deviceData/ring/index.vue
index 44b7cb5..3dec8c5 100644
--- a/src/views/business/deviceData/ring/index.vue
+++ b/src/views/business/deviceData/ring/index.vue
@@ -37,19 +37,21 @@
             <dict-tag :options="biz_device_mode" :value="scope.row.deviceMode" />
           </template>
         </el-table-column>
-        <el-table-column label="心率" align="center" prop="heartRate">
+        <el-table-column label="设备采集模式" align="center" prop="collectMode" >
           <template #default="scope">
-            <p class="ring-data-block bc-heartRate" v-text="`${scope.row.heartRate} BPM`"></p>
+            <dict-tag :options="biz_device_collect_mode" :value="scope.row.collectMode" />
           </template>
         </el-table-column>
-        <el-table-column label="体温" align="center" prop="bodyTemp" >
+        <el-table-column label="设备采集类型" align="center" prop="collectType" >
           <template #default="scope">
-            <p class="ring-data-block bc-bodyTemp" v-text="`${scope.row.bodyTemp} °C`"></p>
+            <dict-tag :options="biz_device_collect_type" :value="scope.row.collectType" />
           </template>
         </el-table-column>
-        <el-table-column label="血氧" align="center" prop="bloodOxygen">
+        <el-table-column label="设备采集值" align="center">
           <template #default="scope">
-            <p class="ring-data-block bc-bloodOxygen" v-text="`${scope.row.bloodOxygen * 100} %`"></p>
+            <p v-if="scope.row.collectType === 'HeartRate'" class="ring-data-block" v-text="`${scope.row.collectValue} BPM`"></p>
+            <p v-if="scope.row.collectType === 'BodyTemp'" class="ring-data-block" v-text="`${scope.row.collectValue} °C`"></p>
+            <p v-if="scope.row.collectType === 'BloodOxygen'" class="ring-data-block" v-text="`${scope.row.collectValue * 100} %`"></p>
           </template>
         </el-table-column>
         <el-table-column label="电池电量" align="center" prop="batteryLevel">
@@ -70,7 +72,7 @@ import { listRing } from '@/api/business/deviceData/ring';
 import { RingVO, RingQuery, RingForm } from '@/api/business/deviceData/ring/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { biz_device_mode } = toRefs<any>(proxy?.useDict('biz_device_mode'));
+const { biz_device_mode, biz_device_collect_mode, biz_device_collect_type } = toRefs<any>(proxy?.useDict('biz_device_mode', "biz_device_collect_mode", "biz_device_collect_type"));
 
 const ringList = ref<RingVO[]>([]);
 const buttonLoading = ref(false);
@@ -173,7 +175,6 @@ onMounted(() => {
   //background-color: rgba(45, 180, 255, 0.8);
 }
 .bc-batteryLevel {
-  border: 2px solid rgb(64, 195, 20);
   color: rgb(64, 195, 20);
   //background-color: rgb(85, 206, 41);
 }