|
@@ -255,31 +255,31 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="flex-col pos_34">
|
|
|
- <view class="flex-col group_15">
|
|
|
- <view class="flex-row justify-between group_2">
|
|
|
- <text class="font_3 text_12">安稳度</text>
|
|
|
- <view class="flex-row items-center space-x-30">
|
|
|
- <text class="font_10">入睡时长</text>
|
|
|
- <view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
- <text class="font_5">{{ formateSeconds(sleepReportFrom.rs_duration) }}</text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+<!-- <view class="flex-col group_15">-->
|
|
|
+<!-- <view class="flex-row justify-between group_2">-->
|
|
|
+<!-- <text class="font_3 text_12">安稳度</text>-->
|
|
|
+<!-- <view class="flex-row items-center space-x-30">-->
|
|
|
+<!-- <text class="font_10">入睡时长</text>-->
|
|
|
+<!-- <view class="flex-row items-baseline shrink-0 space-x-6">-->
|
|
|
+<!-- <text class="font_5">{{ formateSeconds(sleepReportFrom.rs_duration) }}</text>-->
|
|
|
+<!-- </view>-->
|
|
|
+<!-- </view>-->
|
|
|
+<!-- </view>-->
|
|
|
+<!-- </view>-->
|
|
|
<view class="list-divider"></view>
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
<text class="font_3 text_12">离床次数</text>
|
|
|
<view class="flex-row items-center space-x-30">
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
<text class="font_5">{{ sleepReportFrom.report_content.outbed_count.value }}</text>
|
|
|
<text class="font_6">次</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="report_breath_chart">
|
|
|
<view class="echarts-wrap">
|
|
|
<mpvue-echarts class="ec-canvas" canvasId="canvasChart-1" ref="refChart-1" @onInit="onInit1"></mpvue-echarts>
|
|
@@ -287,19 +287,18 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="list-divider"></view>
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
<text class="font_3 text_12">体动次数</text>
|
|
|
<view class="flex-row items-center space-x-30">
|
|
|
- <!-- <text class="font_10">平均呼吸率</text> -->
|
|
|
<view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
<text class="font_5">{{ sleepReportFrom.report_content.move_count.value }}</text>
|
|
|
<text class="font_6">次</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="report_breath_chart">
|
|
|
<view class="echarts-wrap">
|
|
|
<mpvue-echarts class="ec-canvas" canvasId="canvasChart-2" ref="refChart-2" @onInit="onInit1"></mpvue-echarts>
|
|
@@ -315,7 +314,7 @@
|
|
|
<view class="flex-col justify-start flex-auto group">
|
|
|
<view class="flex-col justify-start group_3">
|
|
|
<view class="flex-col group_8 space-y-10">
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col justify-start report_breath">
|
|
|
<view class="flex-col justify-start">
|
|
|
<view class="flex-row items-center group_11 space-x-10 pos_33">
|
|
@@ -330,13 +329,12 @@
|
|
|
/>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col pos_34 report_heart">
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
- <text class="font_3 text_12">心率</text>
|
|
|
+ <text class="font_3 text_12">平均心率</text>
|
|
|
<view class="flex-row items-center space-x-30">
|
|
|
- <text class="font_10">平均心率</text>
|
|
|
<view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
<text class="font_5">{{ sleepReportFrom.report_content.avg_rh.value }}</text>
|
|
|
<text class="font_6">次/分</text>
|
|
@@ -346,12 +344,12 @@
|
|
|
</view>
|
|
|
<view class="report_breath_chart">
|
|
|
<view class="echarts-wrap">
|
|
|
- <mpvue-echarts class="ec-canvas" canvasId="canvasChart-1" ref="refChart-1" @onInit="onInit1"></mpvue-echarts>
|
|
|
+ <mpvue-echarts class="ec-canvas" canvasId="canvasChart-3" ref="refChart-3" @onInit="onInit1"></mpvue-echarts>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<view class="flex-col justify-start report_breath">
|
|
|
<view class="flex-col justify-start">
|
|
@@ -370,49 +368,59 @@
|
|
|
<view class="flex-col pos_34">
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
- <text class="font_3 text_12">呼吸率</text>
|
|
|
+ <text class="font_3 text_12">平均呼吸率</text>
|
|
|
<view class="flex-row items-center space-x-30">
|
|
|
- <text class="font_10">平均呼吸率</text>
|
|
|
<view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
- <text class="font_5">10</text>
|
|
|
+ <text class="font_5">{{ sleepReportFrom.report_content.avg_hx.value }}</text>
|
|
|
<text class="font_6">次/分</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="report_breath_chart"></view>
|
|
|
+
|
|
|
+ <view class="report_breath_chart">
|
|
|
+ <view class="echarts-wrap">
|
|
|
+ <mpvue-echarts class="ec-canvas" canvasId="canvasChart-4" ref="refChart-4" @onInit="onInit1"></mpvue-echarts>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="list-divider"></view>
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
<text class="font_3 text_12">打鼾</text>
|
|
|
<view class="flex-row items-center space-x-30">
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
- <text class="font_5">73</text>
|
|
|
+ <text class="font_5">{{ sleepReportFrom.report_content.snoring_count.value }}</text>
|
|
|
<text class="font_6">次</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="report_breath_chart"></view>
|
|
|
+
|
|
|
+ <view class="report_breath_chart">
|
|
|
+ <view class="echarts-wrap">
|
|
|
+ <mpvue-echarts class="ec-canvas" canvasId="canvasChart-5" ref="refChart-5" @onInit="onInit1"></mpvue-echarts>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="list-divider"></view>
|
|
|
-
|
|
|
+
|
|
|
<view class="flex-col group_15">
|
|
|
<view class="flex-row justify-between group_2">
|
|
|
<text class="font_3 text_12">呼吸暂停</text>
|
|
|
- <view class="flex-row items-center space-x-30">
|
|
|
- <!-- <text class="font_10">平均呼吸率</text> -->
|
|
|
- <view class="flex-row items-baseline shrink-0 space-x-6">
|
|
|
- <text class="font_5">10</text>
|
|
|
- <text class="font_6">次</text>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+<!-- <view class="flex-row items-center space-x-30">-->
|
|
|
+<!-- <view class="flex-row items-baseline shrink-0 space-x-6">-->
|
|
|
+<!-- <text class="font_5">{{ sleepReportFrom.report_content.snoring_count.value }}</text>-->
|
|
|
+<!-- <text class="font_6">次</text>-->
|
|
|
+<!-- </view>-->
|
|
|
+<!-- </view>-->
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="report_breath_chart"></view>
|
|
|
+
|
|
|
+ <view class="report_breath_chart">
|
|
|
+ <view class="echarts-wrap">
|
|
|
+ <mpvue-echarts class="ec-canvas" canvasId="canvasChart-6" ref="refChart-6" @onInit="onInit1"></mpvue-echarts>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -481,7 +489,7 @@
|
|
|
<form>
|
|
|
<view class="cu-form-group solid-bottom">
|
|
|
<view class="title">扫描二维码</view>
|
|
|
- <input type="text" v-model="bindSn" class="text-left"/>
|
|
|
+ <input type="text" v-model="bindSn" placeholder="输入或扫描IMEI" class="text-left"/>
|
|
|
<text class="cuIcon-scan text-xxl text-green" style="font-size: 50rpx;"
|
|
|
@click="scan"></text>
|
|
|
</view>
|
|
@@ -683,9 +691,9 @@
|
|
|
_this.nowChart("refChart-1", 1, data.report_content.dt_arr, data.report_content.outbed_arr)
|
|
|
_this.nowChart("refChart-2", 2, data.report_content.dt_arr, data.report_content.move_arr)
|
|
|
_this.nowChart("refChart-3", 3, data.report_content.dt_arr, data.report_content.rh_arr)
|
|
|
- // _this.nowChart("refChart-4", 4, data.report_content.dt_arr, data.report_content.hx_arr)
|
|
|
- // _this.nowChart("refChart-5", 0, data.report_content.dt_arr, data.report_content.snoring_arr)
|
|
|
- // _this.nowChart("refChart-6", 6, data.report_content.dt_arr, data.report_content.hxstop_arr)
|
|
|
+ _this.nowChart("refChart-4", 4, data.report_content.dt_arr, data.report_content.hx_arr)
|
|
|
+ _this.nowChart("refChart-5", 0, data.report_content.dt_arr, data.report_content.snoring_arr)
|
|
|
+ _this.nowChart("refChart-6", 6, data.report_content.dt_arr, data.report_content.hxstop_arr)
|
|
|
}, 800)
|
|
|
},
|
|
|
// 将分转化为时分
|
|
@@ -784,7 +792,7 @@
|
|
|
show: false, // 是否显示分隔线
|
|
|
},
|
|
|
axisLine: {
|
|
|
- show: false, // 是否显示坐标轴轴线
|
|
|
+ show: true, // 是否显示坐标轴轴线
|
|
|
lineStyle:{
|
|
|
color:'#FFFFFF',
|
|
|
width:1, //x轴线的宽度
|
|
@@ -991,16 +999,16 @@
|
|
|
opacity: 0.8;
|
|
|
background-image: linear-gradient(180deg, #341a4b 0%, #167df2 100%);
|
|
|
border-radius: 0.5rem;
|
|
|
-
|
|
|
+
|
|
|
.report_breath_chart {
|
|
|
position: relative;
|
|
|
height: 7rem;
|
|
|
}
|
|
|
.pos_33 {
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.pos_34 {
|
|
|
-
|
|
|
+
|
|
|
.group_15 {
|
|
|
padding: 1rem 0;
|
|
|
.font_10 {
|
|
@@ -1377,7 +1385,7 @@
|
|
|
top: 8.06rem;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.space-x-6 {
|
|
|
& > view:not(:first-child),
|
|
|
& > text:not(:first-child),
|
|
@@ -1413,7 +1421,7 @@
|
|
|
color: #a5b6ca;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.space-x-4 {
|
|
|
& > view:not(:first-child),
|
|
|
& > text:not(:first-child),
|
|
@@ -1580,7 +1588,7 @@
|
|
|
height: 1.41rem;
|
|
|
border: solid 0.031rem #4a315e;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.group_11 {
|
|
|
width: 8.25rem;
|
|
|
}
|