Merge branch 'dev'

This commit is contained in:
weidizhu_admin 2024-09-18 13:23:18 +08:00
commit a8fb16102f
9 changed files with 15 additions and 15 deletions

View File

@ -53,7 +53,7 @@
{{ item.data_msg[4] ? 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).toFixed(2)}} 微摩尔/
</view> </view>
<view v-if="type == 'meiTuo'"> <view v-if="type == 'meiTuo'">
{{item.data_msg[0] / 10}} MET {{item.data_msg[0] / 10}} MET
@ -61,10 +61,10 @@
<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/100}}</view> --> <view>密度脂蛋白:-{{item.data_msg.highDensity/100}} -{{item.data_msg.lowDensity/100}}</view> -->
<view>总胆固醇{{item.data_msg.cholesterol/100}} </view> <view>总胆固醇{{(item.data_msg.cholesterol/100).toFixed(2)}} </view>
<view>甘油三脂{{item.data_msg.triacylglycerol/100}} </view> <view>甘油三脂{{(item.data_msg.triacylglycerol/100).toFixed(2)}} </view>
<view>高密度脂蛋白:{{item.data_msg.highDensity/100}}</view> <view>高密度脂蛋白:{{(item.data_msg.highDensity/100).toFixed(2)}}</view>
<view>低胆固醇{{item.data_msg.lowDensity/100}} </view> <view>低胆固醇{{(item.data_msg.lowDensity/100).toFixed(2)}} </view>
</view> </view>
<view v-if="type == 'ECGData'" style="font-size: 24rpx;"> <view v-if="type == 'ECGData'" style="font-size: 24rpx;">
<view>心率:{{item.data_msg.meanHeartRate}} /</view> <view>心率:{{item.data_msg.meanHeartRate}} /</view>

View File

@ -188,7 +188,7 @@
<view class="date"> <view class="date">
<view class="flex_data"> <view class="flex_data">
<view class="f_left"> <view class="f_left">
{{dataListsNew.ECGData.data_msg? (dataListsNew.ECGData.data_msg.heartRate || dataListsNew.ECGData.data_msg.averageHRV) : '--'}} {{dataListsNew.ECGData.data_msg? (dataListsNew.ECGData.data_msg.heartRate || dataListsNew.ECGData.data_msg.meanHeartRate) : '--'}}
</view> </view>
<view class="f_right"> <view class="f_right">
<text class="icon">/</text> <text class="icon">/</text>
@ -234,7 +234,7 @@
总胆固醇 总胆固醇
</view> </view>
<view class="num"> <view class="num">
{{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.cholesterol) : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.cholesterol / 100).toFixed(2) : '--'}}
<text class="icon">毫摩尔/</text> <text class="icon">毫摩尔/</text>
</view> </view>
</view> </view>
@ -243,7 +243,7 @@
甘油三脂 甘油三脂
</view> </view>
<view class="num"> <view class="num">
{{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.triacylglycerol) : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.triacylglycerol / 100).toFixed(2) : '--'}}
<text class="icon">毫摩尔/</text> <text class="icon">毫摩尔/</text>
</view> </view>
</view> </view>
@ -252,7 +252,7 @@
高密度脂蛋白 高密度脂蛋白
</view> </view>
<view class="num"> <view class="num">
{{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.highDensity) : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.highDensity / 100).toFixed(2) : '--'}}
<text class="icon">毫摩尔/</text> <text class="icon">毫摩尔/</text>
</view> </view>
</view> </view>
@ -261,7 +261,7 @@
低密度脂蛋白 低密度脂蛋白
</view> </view>
<view class="num"> <view class="num">
{{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.lowDensity) : '--'}} {{dataListsNew.bloodLiquid.data_msg? (dataListsNew.bloodLiquid.data_msg.lowDensity / 100).toFixed(2) : '--'}}
<text class="icon">毫摩尔/</text> <text class="icon">毫摩尔/</text>
</view> </view>
</view> </view>

View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>智能终端</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>智能终端</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/watchapp/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/watchapp/static/js/chunk-vendors.48364482.js></script><script src=/watchapp/static/js/index.80bfd6e1.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/watchapp/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/watchapp/static/js/chunk-vendors.48364482.js></script><script src=/watchapp/static/js/index.8e9d230c.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long