From f6e5bb78da5a3542f9fb436cb1fea944d01bef73 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Tue, 8 Jul 2025 17:50:37 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secondaryScreen/screen-right/oneR.vue     |  2 +-
 .../secondaryScreen/screen-right/threeR.vue   |  2 +-
 src/router/index.ts                           |  6 ++++--
 src/views/indexSun.vue                        |  2 ++
 src/views/indexSun/indexModal.vue             |  3 ---
 src/views/indexSun/oneL.vue                   | 19 +++++++++++--------
 src/views/indexSun/twoL.vue                   | 15 +++++++++------
 src/views/indexSun/twoR.vue                   | 18 +++++++++++-------
 8 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/components/secondaryScreen/screen-right/oneR.vue b/src/components/secondaryScreen/screen-right/oneR.vue
index e68da00..ee00aaf 100644
--- a/src/components/secondaryScreen/screen-right/oneR.vue
+++ b/src/components/secondaryScreen/screen-right/oneR.vue
@@ -3,7 +3,7 @@
         <public-title title="睡眠" :theme-type="themeType" />
         <div class="inner">
             <div class="title">
-                <span class="lightSleep">平均睡眠 {{ nums.avg }} 深睡 {{ nums.avgLong }} 浅睡 {{ nums.avgShort }}</span>
+                <span class="lightSleep">平均睡眠 {{ nums.avg || 0 }} 深睡 {{ nums.avgLong || 0 }} 浅睡 {{ nums.avgShort || 0 }}</span>
             </div>
             <div class="sleepChart" ref="sleepChart"></div>
         </div>
diff --git a/src/components/secondaryScreen/screen-right/threeR.vue b/src/components/secondaryScreen/screen-right/threeR.vue
index 61cf0da..7a60c6f 100644
--- a/src/components/secondaryScreen/screen-right/threeR.vue
+++ b/src/components/secondaryScreen/screen-right/threeR.vue
@@ -26,7 +26,7 @@
             </a-table>
         </div>
         <!--预警查看详情-->
-        <EarlyWarningDialog ref="earlyWarningRef"></EarlyWarningDialog>
+        <EarlyWarningDialog ref="earlyWarningRef" />
     </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/router/index.ts b/src/router/index.ts
index 486b43f..4cbe54c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -50,6 +50,10 @@ const router: Router = createRouter({
 });
 
 router.beforeEach((to, from, next) => {
+    debugger;
+    if (to.path !== '/login') {
+        setCurrentPath(to.path);
+    }
     if (to.path == '/login') {
         next();
     } else {
@@ -61,7 +65,5 @@ router.beforeEach((to, from, next) => {
             next();
         }
     }
-
-    next();
 });
 export default router;
diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue
index d00cbda..a284311 100644
--- a/src/views/indexSun.vue
+++ b/src/views/indexSun.vue
@@ -354,6 +354,8 @@
     }
 
     onUnmounted(() => {
+        if (qhInterval.value) clearInterval(qhInterval.value);
+        if (cInterval.value) clearInterval(cInterval.value);
         // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
         window.onbeforeunload = function () {
             closeSocket();
diff --git a/src/views/indexSun/indexModal.vue b/src/views/indexSun/indexModal.vue
index 5057811..9486753 100644
--- a/src/views/indexSun/indexModal.vue
+++ b/src/views/indexSun/indexModal.vue
@@ -247,7 +247,6 @@
             ...formRecord.value,
             ...result,
         };
-        console.log(formRecord.value);
     }
     function handleClicksearch() {
         formState.value = {
@@ -264,7 +263,6 @@
         orgCode2.value = '';
         orgCode1.value = '';
         formState.value = {};
-        console.log(formState.value, formRecord.value, 'asjshj');
         formRecord.value = {};
         closeDialog();
     }
@@ -277,7 +275,6 @@
             ...formRecord.value,
             salvageUserDepart: '',
         };
-        console.log(formState.value, formRecord.value);
     }
     defineExpose({
         openDialog,
diff --git a/src/views/indexSun/oneL.vue b/src/views/indexSun/oneL.vue
index b541f26..26573fb 100644
--- a/src/views/indexSun/oneL.vue
+++ b/src/views/indexSun/oneL.vue
@@ -78,14 +78,17 @@
             condition: chooseType.value,
             centerId: props.centerId,
         };
-        statisticsNewApi(params).then((res) => {
-            console.log(res);
-            if (res.code != 200 || !res.result) {
-                return;
-            }
-            setSession(LEFT_KEY1, JSON.stringify(res.result));
-            setValue(res.result);
-        });
+        statisticsNewApi(params)
+            .then((res) => {
+                if (res.code != 200 || !res.result) {
+                    return;
+                }
+                setSession(LEFT_KEY1, JSON.stringify(res.result));
+                setValue(res.result);
+            })
+            .catch((e) => {
+                console.log(e);
+            });
     }
 
     function setValue(result) {
diff --git a/src/views/indexSun/twoL.vue b/src/views/indexSun/twoL.vue
index aff7aaa..7cdee38 100644
--- a/src/views/indexSun/twoL.vue
+++ b/src/views/indexSun/twoL.vue
@@ -96,12 +96,15 @@
         twoLApi({
             sex: chooseType.value,
             depart: selectValue.value,
-        }).then((res) => {
-            console.log(res, 'resessss');
-            if (res.code == 200) {
-                initChart(res.result);
-            }
-        });
+        })
+            .then((res: any) => {
+                if (res.code == 200) {
+                    initChart(res.result);
+                }
+            })
+            .catch((err) => {
+                console.log(err);
+            });
     }
 
     function initChart(value) {
diff --git a/src/views/indexSun/twoR.vue b/src/views/indexSun/twoR.vue
index dfff798..8a2af86 100644
--- a/src/views/indexSun/twoR.vue
+++ b/src/views/indexSun/twoR.vue
@@ -147,13 +147,17 @@
     });
 
     function getList() {
-        twoRApi({}).then((res) => {
-            if (res.code == 200) {
-                localStorage.removeItem('twoRList');
-                twoRList.value = res.result;
-                localStorage.setItem('twoRList', JSON.stringify(res.result));
-            }
-        });
+        twoRApi({})
+            .then((res: any) => {
+                if (res.code == 200) {
+                    localStorage.removeItem('twoRList');
+                    twoRList.value = res.result;
+                    localStorage.setItem('twoRList', JSON.stringify(res.result));
+                }
+            })
+            .catch((err) => {
+                console.log(err);
+            });
     }
     function handleClickNum1(type, date, normal) {
         emit('handleClick', { type, date, normal });