From f016fdc69f3ef9088d858af2d192a9a28474d61c Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Fri, 29 Dec 2023 14:53:21 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E7=9D=A1=E7=9C=A0=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/userInfoModal/sleep.vue        | 29 ++++++++++++++-----
 .../components/userInfoModal/stepNumber.vue   |  6 ++--
 2 files changed, 24 insertions(+), 11 deletions(-)

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 @@
         <div style="width: 15%; text-align: center">
             <div>
                 <span style="font-size: 25px"> {{ maxInfo }}</span>
+                <span style="color: #aa9db6">分钟</span>
             </div>
             <div style="color: #aa9db6">最高睡眠时长</div>
         </div>
         <div style="width: 15%; text-align: center">
             <div>
                 <span style="font-size: 25px"> {{ minInfo }}</span>
+                <span style="color: #aa9db6">分钟</span>
             </div>
             <div style="color: #aa9db6">最低睡眠时长</div>
         </div>
         <div style="width: 15%; text-align: center">
             <div>
                 <span style="font-size: 25px">{{ middleInfo }}</span>
+                <span style="color: #aa9db6">分钟</span>
             </div>
             <div style="color: #aa9db6">平均睡眠时长</div>
         </div>
@@ -157,14 +160,24 @@
                             } else {
                                 str =
                                     xArr[tar.dataIndex] +
-                                    '<br/>' +
-                                    '深睡' +
-                                    ' : ' +
-                                    (tar.value ? tar.value : 0) +
-                                    '<br/>' +
-                                    '浅睡' +
-                                    ' : ' +
-                                    (tar1.value ? tar1.value : 0);
+                                    `<div>
+                                            <div style="display: flex;justify-content: space-between">
+                                                <div>
+                                                    深睡：${tar.value ? tar.value : 0}
+                                                </div>
+                                                <div style="padding-left: 5px">
+                                                    分钟
+                                                </div>
+                                            </div>
+                                            <div style="display: flex;justify-content: space-between;">
+                                                <div>
+                                                    浅睡：${tar1.value ? tar1.value : 0}
+                                                </div>
+                                                <div style="padding-left: 5px;">
+                                                    分钟
+                                                </div>
+                                            </div>
+                                    </div>`;
                             }
                             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');
     });
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less"></style>