diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue index 34d1190..951332f 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue @@ -4,18 +4,21 @@
{{ maxInfo }} + 分钟
最高睡眠时长
{{ minInfo }} + 分钟
最低睡眠时长
{{ middleInfo }} + 分钟
平均睡眠时长
@@ -157,14 +160,24 @@ } else { str = xArr[tar.dataIndex] + - '
' + - '深睡' + - ' : ' + - (tar.value ? tar.value : 0) + - '
' + - '浅睡' + - ' : ' + - (tar1.value ? tar1.value : 0); + `
+
+
+ 深睡:${tar.value ? tar.value : 0} +
+
+ 分钟 +
+
+
+
+ 浅睡:${tar1.value ? tar1.value : 0} +
+
+ 分钟 +
+
+
`; } return str; }, diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue index e5f6be1..25e2fe1 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/stepNumber.vue @@ -110,8 +110,8 @@ let xArr = []; let yArr = []; maxInfo.value = result.total ? result.total : '/'; - middleInfo.value = result.total1 ? result.total1 : '/'; - minInfo.value = result.total2 ? result.total2 : '/'; + middleInfo.value = result.total2 ? result.total2 : '/'; + minInfo.value = result.total1 ? result.total1 : '/'; if (type === '1') return; result.viewDataList.map((item) => { xArr.push(item.date); @@ -205,4 +205,4 @@ initEchart('0'); }); - \ No newline at end of file +