feat 设备数据页面随接口调整

This commit is contained in:
Eee 2024-06-13 17:17:31 +08:00
parent 3c7493c858
commit 0fbc0192c7
2 changed files with 12 additions and 11 deletions

View File

@ -3,9 +3,9 @@ export interface RingVO {
deviceId: string; deviceId: string;
deviceMode: string; deviceMode: string;
activationTime: string; activationTime: string;
heartRate: number; collectMode: string;
bodyTemp: number; collectType: string;
bloodOxygen: number; collectValue: string;
collectTime: string; collectTime: string;
} }

View File

@ -37,19 +37,21 @@
<dict-tag :options="biz_device_mode" :value="scope.row.deviceMode" /> <dict-tag :options="biz_device_mode" :value="scope.row.deviceMode" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="心率" align="center" prop="heartRate"> <el-table-column label="设备采集模式" align="center" prop="collectMode" >
<template #default="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="体温" align="center" prop="bodyTemp" > <el-table-column label="设备采集类型" align="center" prop="collectType" >
<template #default="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="血氧" align="center" prop="bloodOxygen"> <el-table-column label="设备采集值" align="center">
<template #default="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="电池电量" align="center" prop="batteryLevel"> <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'; import { RingVO, RingQuery, RingForm } from '@/api/business/deviceData/ring/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; 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 ringList = ref<RingVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -173,7 +175,6 @@ onMounted(() => {
//background-color: rgba(45, 180, 255, 0.8); //background-color: rgba(45, 180, 255, 0.8);
} }
.bc-batteryLevel { .bc-batteryLevel {
border: 2px solid rgb(64, 195, 20);
color: rgb(64, 195, 20); color: rgb(64, 195, 20);
//background-color: rgb(85, 206, 41); //background-color: rgb(85, 206, 41);
} }