whitechiina
/
ai-watch-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据对接完成

This commit is contained in:
weidizhu_admin 2024-07-15 18:23:20 +08:00
parent f0e3061f91
commit b23fdc701b
6 changed files with 144 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/api.js
View File

@ -38,6 +38,10 @@ export const getDeviceListDays = (data) => {
export const getVersion = (data) => { export const getVersion = (data) => {
return post('watch/version/index', data) return post('watch/version/index', data)
} }
// 获取版本号
export const getIndexData = (data) => {
return post('watch/device/getIndexData', data)
}
export default { export default {
@ -48,5 +52,6 @@ export default {
getBindUserDeviceId, getBindUserDeviceId,
getDayInfo, getDayInfo,
getDeviceListDays, getDeviceListDays,
getVersion getVersion,
getIndexData
} }

2
config/request.js
View File

@ -77,7 +77,7 @@ export default () => {
uni.$u.toast(data.msg) uni.$u.toast(data.msg)
} }
if (data.code == 1005) { if (data.code == 7777) {
uni.showToast({ uni.showToast({
mask: true, mask: true,
title: '请重新登录', title: '请重新登录',

2
manifest.json
View File

@ -116,7 +116,7 @@
"disableHostCheck" : true, // 开启可以用自己的域名 "disableHostCheck" : true, // 开启可以用自己的域名
"proxy" : { "proxy" : {
"/watch" : { "/watch" : {
"target" : "http://test.sc2.agrimedia.cn", "target" : "https://ai.agrimedia.cn",
"changeOrigin" : true, "changeOrigin" : true,
"secure" : false "secure" : false
} }

68
pages/index/detail.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<z-paging ref="paging" v-model="dataList" @query="queryList"> <z-paging ref="paging" v-model="dataList" @query="queryList" usePageScroll>
<tm-nav-bar left-icon="arrow-left" :title="desc? getNameByKey(desc) : getNameByKey(type)" @clickLeft="back" /> <tm-nav-bar left-icon="arrow-left" :title="desc? getNameByKey(desc) : getNameByKey(type)" @clickLeft="back" />
<view class="content"> <view class="content">
<view class="over" style="margin-top: 30rpx" @click="flag = !flag"> <view class="over" style="margin-top: 30rpx" @click="flag = !flag">
@ -18,21 +18,42 @@
运动量：{{item.data_msg.amountOfExercise}} 运动量：{{item.data_msg.amountOfExercise}}
</view> </view>
<view v-if="type == 'bloodPressure'"> <view v-if="type == 'bloodPressure'">
{{item.data_msg.bloodPressureHigh}}/{{item.data_msg.bloodPressureLow}} {{item.data_msg.bloodPressureHigh}}/{{item.data_msg.bloodPressureLow}} mmHg
</view>
<view v-if="type == 'bloodOxygen'">
{{ item.data_msg[0] ? item.data_msg[0] + (item.data_msg[1]?' | ':'') : ''}}
{{ item.data_msg[1] ? item.data_msg[1] + (item.data_msg[2]?' | ':'') : ''}}
{{ item.data_msg[2] ? item.data_msg[2] + (item.data_msg[3]?' | ':'') : ''}}
{{ item.data_msg[3] ? item.data_msg[3] + (item.data_msg[4]?' | ':'') : ''}}
{{ item.data_msg[4] ? item.data_msg[4] : ''}}
</view> </view>
<view v-if="type == 'bloodGlucose'"> <view v-if="type == 'bloodGlucose'">
{{item.data_msg}} {{item.data_msg}}毫摩尔/升
</view>
<view v-if="type == 'bodyTemperature'">
{{item.data_msg}} ℃
</view>
<view v-if="type == 'pulseReat'">
{{ item.data_msg[0] ? item.data_msg[0] + (item.data_msg[1]?' | ':'') : ''}}
{{ item.data_msg[1] ? item.data_msg[1] + (item.data_msg[2]?' | ':'') : ''}}
{{ item.data_msg[2] ? item.data_msg[2] + (item.data_msg[3]?' | ':'') : ''}}
{{ item.data_msg[3] ? item.data_msg[3] + (item.data_msg[4]?' | ':'') : ''}}
{{ item.data_msg[4] ? item.data_msg[4] : ''}}
</view> </view>
<view v-if="type == 'bloodLiquid' && desc == 'uricAcidVal'"> <view v-if="type == 'bloodLiquid' && desc == 'uricAcidVal'">
{{item.data_msg.uricAcidVal}} {{item.data_msg.uricAcidVal / 10}} 微摩尔/升
</view>
<view v-if="type == 'meiTuo'">
{{item.data_msg[0] / 10}} MET
</view> </view>
<view v-if="type == 'bloodLiquid' && desc !== 'uricAcidVal'" style="font-size: 24rpx;"> <view v-if="type == 'bloodLiquid' && desc !== 'uricAcidVal'" style="font-size: 24rpx;">
<view>胆固醇：{{item.data_msg.cholesterol/100}} 三酰甘油：{{item.data_msg.triacylglycerol/100}}</view> <view>总胆固醇：{{item.data_msg.cholesterol/100}} 甘油三脂：{{item.data_msg.triacylglycerol/100}}</view>
<view>高密度脂蛋白：{{item.data_msg.highDensity/100}}低密度脂蛋白：{{item.data_msg.lowDensity}}</view> <view>高密度脂蛋白：{{item.data_msg.highDensity/100}}低密度脂蛋白：{{item.data_msg.lowDensity}}</view>
</view> </view>
<view v-else> <!-- <view v-if="Array.isArray(type)">
{{getArrMaxValue(item.data_msg)}} {{item.data_msg[0]}}
</view> </view> -->
</view> </view>
<view class="time"> <view class="time">
{{item.date_str}} {{item.hour_minute}} {{item.date_str}} {{item.hour_minute}}
@ -45,6 +66,7 @@
<script> <script>
import { getArrMaxValue } from '@/utils/utils.js' import { getArrMaxValue } from '@/utils/utils.js'
import { mapGetters } from "vuex";
export default { export default {
data() { data() {
return { return {
@ -55,13 +77,13 @@
bloodGlucose: "血糖", bloodGlucose: "血糖",
bloodOxygen: "血氧", bloodOxygen: "血氧",
bloodPressure: '血压', bloodPressure: '血压',
heartReat: '心率', pulseReat: '心率',
bloodLiquid: "血液", bloodLiquid: "血脂",
uricAcidVal: '尿酸', uricAcidVal: '尿酸',
meiTuo: '梅拖', meiTuo: '梅脱',
pulseReat: '脉率', // pulseReat: '脉率',
updataDate: '更新时间', updataDate: '更新时间',
temperature: '体温', bodyTemperature: '体温',
step: '步数' step: '步数'
}, },
time: new Date().toISOString().substring(0, 10), time: new Date().toISOString().substring(0, 10),
@ -90,6 +112,10 @@
// this.addTimer() // this.addTimer()
// },2000) // },2000)
// }, // },
onLoad(e) {
this.type = e.type;
this.desc = e.desc||'';
},
onShow(e) { onShow(e) {
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
@ -100,19 +126,25 @@
for (let key in curParam) { for (let key in curParam) {
param += '&' + key + '=' + curParam[key] param += '&' + key + '=' + curParam[key]
} }
this.type = curParam.type;
this.desc = curParam.desc;
},
computed: {
...mapGetters({
getActiceDevice: "api/getActiceDevice"
})
}, },
methods: { methods: {
getArrMaxValue, getArrMaxValue,
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
this.$store.dispatch('api/getDeviceListDays', { this.$store.dispatch('api/getDeviceListDays', {
type: this.type, type: this.type,
device_real_time: this.time device_real_time: this.time,
device_id:this.getActiceDevice.device_id
}).then(res => { }).then(res => {
this.$refs.paging.completeByTotal(res.data, res.total); console.log('res',res)
this.$refs.paging.completeByTotal(res.data,res.last_page);
}); });
}, },

126
pages/index/index.vue
View File

@ -19,36 +19,28 @@
<view class="item"> <view class="item">
<view class="title">卡路里</view> <view class="title">卡路里</view>
<view class="row-date"> <view class="row-date">
<view v-if="dataLists.step">
{{dataLists.step && Number.isFinite(Number(dataLists.step.calorie)) ? dataLists.step.calorie/10 : '--'}} <view>{{dataListsNew.stepIndex.data_msg ? dataListsNew.stepIndex.data_msg.calorie / 10 : '--'}}</view>
</view>
<view v-else>--</view>
<text>千卡</text> <text>千卡</text>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="title">步数</view> <view class="title">步数</view>
<view class="row-date"> <view class="row-date">
<view v-if="dataLists.step"> <view>{{dataListsNew.stepIndex.data_msg ? dataListsNew.stepIndex.data_msg.step / 10 : '--'}}</view>
{{dataLists.step && Number.isFinite(Number(dataLists.step.step)) ? dataLists.step.step : '--'}}
</view>
<view v-else>--</view>
<text>步</text> <text>步</text>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="title">距离</view> <view class="title">距离</view>
<view class="row-date"> <view class="row-date">
<view v-if="dataLists.step"> <view>{{dataListsNew.stepIndex.data_msg ? dataListsNew.stepIndex.data_msg.distance / 1000 : '--'}}</view>
{{dataLists.step && Number.isFinite(Number(dataLists.step.distance)) ? dataLists.step.distance/100 : '--'}}
</view>
<view v-else>--</view>
<text>公里</text> <text>公里</text>
</view> </view>
</view> </view>
<view class="row-time" v-if="dataLists.step"> <view class="row-time" v-if="dataListsNew.stepIndex">
{{formatDateTime(dataLists.updataDate)}} {{formatDateTime(dataListsNew.stepIndex.device_real_time)}}
</view> </view>
<view class="bg"> <view class="bg">
<!-- <image src="../../static/icon/血糖.png" mode="widthFix"></image> --> <!-- <image src="../../static/icon/血糖.png" mode="widthFix"></image> -->
@ -59,10 +51,10 @@
{{getNameByKey('bloodGlucose')}} {{getNameByKey('bloodGlucose')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.bloodGlucose? dataLists.bloodGlucose.date + '更新' : '--'}} {{dataListsNew.bloodGlucose.data_msg? dataListsNew.bloodGlucose.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.bloodGlucose? dataLists.bloodGlucose.bloodGlucose : '--'}} {{dataListsNew.bloodGlucose.data_msg || '--'}}
<text class="icon">毫摩尔/升</text> <text class="icon">毫摩尔/升</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -74,10 +66,10 @@
{{getNameByKey('bloodOxygen')}} {{getNameByKey('bloodOxygen')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.bloodOxygen? dataLists.bloodOxygen.date + '更新' : '--'}} {{dataListsNew.bloodOxygen.data_msg? dataListsNew.bloodOxygen.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.bloodOxygen? getArrMaxValue(dataLists.bloodOxygen.bloodOxygen) : '--'}} {{dataListsNew.bloodOxygen.data_msg? (dataListsNew.bloodOxygen.data_msg[0]) : '--'}}
<text class="icon">%</text> <text class="icon">%</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -89,10 +81,10 @@
{{getNameByKey('bloodPressure')}} {{getNameByKey('bloodPressure')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.bloodPressure? dataLists.bloodPressure.date + '更新' : '--'}} {{dataListsNew.bloodPressure.data_msg? dataListsNew.bloodPressure.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.bloodPressure? dataLists.bloodPressure.bloodPressure.bloodPressureHigh + '/' + dataLists.bloodPressure.bloodPressure.bloodPressureLow : '--'}} {{dataListsNew.bloodPressure.data_msg? dataListsNew.bloodPressure.data_msg.bloodPressureHigh + '/' + dataListsNew.bloodPressure.data_msg.bloodPressureLow : '--'}}
<text class="icon">mmHG</text> <text class="icon">mmHG</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -100,15 +92,15 @@
</view> </view>
</view> </view>
<view class="content-item" @click="toPage('/pages/index/detail?type=temperature')"> <view class="content-item" @click="toPage('/pages/index/detail?type=bodyTemperature')">
<view class="title"> <view class="title">
{{getNameByKey('temperature')}} {{getNameByKey('bodyTemperature')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.temperature? dataLists.temperature.time + '更新' : '--'}} {{dataListsNew.bodyTemperature.data_msg? dataListsNew.bodyTemperature.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.temperature? dataLists.temperature.bodySurfaceTemperature : '--'}} {{dataListsNew.bodyTemperature.data_msg? (dataListsNew.bodyTemperature.data_msg) : '--'}}
<text class="icon">℃</text> <text class="icon">℃</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -116,15 +108,15 @@
</view> </view>
</view> </view>
<view class="content-item" @click="toPage('/pages/index/detail?type=heartReat')"> <view class="content-item" @click="toPage('/pages/index/detail?type=pulseReat')">
<view class="title"> <view class="title">
{{getNameByKey('heartReat')}} {{getNameByKey('pulseReat')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.heartReat? dataLists.heartReat.date + '更新' : '--'}} {{dataListsNew.pulseReat.data_msg? dataListsNew.pulseReat.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.heartReat? getArrMaxValue(dataLists.heartReat.heartReat) : '--'}} {{dataListsNew.pulseReat.data_msg? (dataListsNew.pulseReat.data_msg[0]) : '--'}}
<text class="icon">次/分</text> <text class="icon">次/分</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -136,10 +128,10 @@
{{getNameByKey('meiTuo')}} {{getNameByKey('meiTuo')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.meiTuo? dataLists.meiTuo.date + '更新' : '--'}} {{dataListsNew.meiTuo.data_msg? dataListsNew.meiTuo.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.meiTuo? getArrMaxValue(dataLists.meiTuo.meiTuo) : '--'}} {{dataListsNew.meiTuo.data_msg? (dataListsNew.meiTuo.data_msg[0] / 10) : '--'}}
<text class="icon">MET</text> <text class="icon">MET</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -151,10 +143,10 @@
尿酸 尿酸
</view> </view>
<view class="time"> <view class="time">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.date + '更新' : '--'}} {{dataListsNew.bloodLiquid.data_msg? dataListsNew.bloodLiquid.device_real_time + '更新' : '--'}}
</view> </view>
<view class="date"> <view class="date">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.bloodLiquid.uricAcidVal/10 : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.uricAcidVal / 10) : '--'}}
<text class="icon">微摩尔/升</text> <text class="icon">微摩尔/升</text>
</view> </view>
<view class="bg"> <view class="bg">
@ -167,24 +159,24 @@
{{getNameByKey('bloodLiquid')}} {{getNameByKey('bloodLiquid')}}
</view> </view>
<view class="time"> <view class="time">
{{dataLists.meiTuo? dataLists.meiTuo.date + '更新' : '--'}} {{dataListsNew.bloodLiquid.data_msg? dataListsNew.bloodLiquid.device_real_time + '更新' : '--'}}
</view> </view>
<view class="gap-content"> <view class="gap-content">
<view class="gap-item"> <view class="gap-item">
<view class="title"> <view class="title">
胆固醇 总胆固醇
</view> </view>
<view class="num"> <view class="num">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.bloodLiquid.cholesterol/100 : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.cholesterol / 100) : '--'}}
<text class="icon">微摩尔/升</text> <text class="icon">微摩尔/升</text>
</view> </view>
</view> </view>
<view class="gap-item"> <view class="gap-item">
<view class="title"> <view class="title">
三酰甘油 甘油三脂
</view> </view>
<view class="num"> <view class="num">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.bloodLiquid.triacylglycerol/100 : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.triacylglycerol / 100) : '--'}}
<text class="icon">微摩尔/升</text> <text class="icon">微摩尔/升</text>
</view> </view>
</view> </view>
@ -193,7 +185,7 @@
高密度脂蛋白 高密度脂蛋白
</view> </view>
<view class="num"> <view class="num">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.bloodLiquid.highDensity/100 : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.highDensity / 100) : '--'}}
<text class="icon">微摩尔/升</text> <text class="icon">微摩尔/升</text>
</view> </view>
</view> </view>
@ -202,7 +194,7 @@
低密度脂蛋白 低密度脂蛋白
</view> </view>
<view class="num"> <view class="num">
{{dataLists.bloodLiquid? dataLists.bloodLiquid.bloodLiquid.lowDensity/100 : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.lowDensity / 100) : '--'}}
<text class="icon">微摩尔/升</text> <text class="icon">微摩尔/升</text>
</view> </view>
</view> </view>
@ -228,17 +220,50 @@
bloodGlucose: "血糖", bloodGlucose: "血糖",
bloodOxygen: "血氧", bloodOxygen: "血氧",
bloodPressure: '血压', bloodPressure: '血压',
heartReat: '心率', pulseReat: '心率',
bloodLiquid: "血液", bloodLiquid: "血脂",
meiTuo: '梅拖', meiTuo: '梅脱',
pulseReat: '脉率', pulseReat: '心率',
updataDate: '更新时间', updataDate: '更新时间',
temperature: '体温' bodyTemperature: '体温'
}, },
dataLists: {} dataLists: {},
dataListsNew:{
stepIndex:{},
pulseReat:{},
bloodOxygen:{},
bloodPressure:{},
bloodGlucose:{},
meiTuo:{},
bodyTemperature:{},
bloodLiquid:{}
}
// dataListsNew:{
// stepIndex:{
// calorie:'--',
// distance:'--',
// step:'--',
// },
// pulseReat:[],
// bloodOxygen:[],
// bloodPressure:{
// bloodPressureHigh:'',
// bloodPressureLow:''
// },
// bloodGlucose:'',
// meiTuo:[],
// bodyTemperature:'',
// bloodLiquid:{
// cholesterol:0,
// highDensity:0,
// lowDensity:0,
// triacylglycerol:0,
// uricAcidVal:0,
// }
// }
} }
}, },
onLoad() { onLoad() {
this.onRefresh(); this.onRefresh();
}, },
computed: { computed: {
@ -249,8 +274,13 @@
methods: { methods: {
getArrMaxValue, getArrMaxValue,
onRefresh(pageNo, pageSize) { onRefresh(pageNo, pageSize) {
this.$store.dispatch('api/getDayInfo', { device_id: this.getActiceDevice.device_id }).then(res => { this.$store.dispatch('api/getIndexData', { device_id: this.getActiceDevice.device_id }).then(res => {
this.dataLists = res.data_msg; for(let i = 0;i<res.length;i++){
// console.log(this.dataListsNew[res[i].type])
// console.log(res[i].data_msg)
this.dataListsNew[res[i].type] = res[i]
}
// this.dataListsNew = res.data_msg;
this.$refs.paging.complete(); this.$refs.paging.complete();
}); });
}, },

10
store/modules/api.js
View File

@ -6,7 +6,8 @@ import {
getBindUserDeviceId, getBindUserDeviceId,
getDayInfo, getDayInfo,
getDeviceListDays, getDeviceListDays,
getVersion getVersion,
getIndexData
} from '@/common/api.js'; } from '@/common/api.js';
let state = { let state = {
@ -75,7 +76,12 @@ let state = {
async getVersion({commit}, data) { async getVersion({commit}, data) {
const res = await getVersion(data) const res = await getVersion(data)
return res return res
} },
async getIndexData({commit}, data) {
const res = await getIndexData(data)
return res
},
} }
export default { export default {
namespaced: true, namespaced: true,