From 510f34953f348456c67345237b23030fd9d7b940 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Mon, 20 May 2024 15:25:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/body-d-left/oneL.vue   | 2 +-
 src/components/body-d-left/threeL.vue | 5 +++--
 src/components/body-d-left/twoL.vue   | 2 +-
 src/enum/pageEnum.ts                  | 3 ++-
 src/views/index.vue                   | 6 +++---
 src/views/yinChuan/yinChuan.vue       | 8 ++++++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/body-d-left/oneL.vue b/src/components/body-d-left/oneL.vue
index 3d0d3e2..2be18c1 100644
--- a/src/components/body-d-left/oneL.vue
+++ b/src/components/body-d-left/oneL.vue
@@ -75,7 +75,7 @@
         }
     }
 
-    function setValue(result) {
+    function setValue(result = {}) {
         let { alerdyreceive = '', totalacceptance = '' } = result;
         setStatistics(result);
         if (alerdyreceive || totalacceptance) {
diff --git a/src/components/body-d-left/threeL.vue b/src/components/body-d-left/threeL.vue
index 4d51073..3346623 100644
--- a/src/components/body-d-left/threeL.vue
+++ b/src/components/body-d-left/threeL.vue
@@ -77,9 +77,10 @@
 
     function initChart() {
         const myChart = echarts.init(document.querySelector('.RadarCharts'));
-        let countList = radarList.value.map((item) => item?.userCount);
+        let countList = radarList?.value.map((item) => item?.userCount);
+        if (countList.length < 1) return;
         let max = Math.max(...countList);
-        const indicator = radarList.value.map((item) => ({ name: item?.hospitalName, max: max }));
+        const indicator = radarList?.value.map((item) => ({ name: item?.hospitalName, max: max }));
         const option = radarCharts({ indicator, countList });
         myChart.setOption(option);
         window.addEventListener('resize', () => {
diff --git a/src/components/body-d-left/twoL.vue b/src/components/body-d-left/twoL.vue
index c4196c8..e862fb4 100644
--- a/src/components/body-d-left/twoL.vue
+++ b/src/components/body-d-left/twoL.vue
@@ -89,7 +89,7 @@
             }
         } catch {
             setSpin(false);
-            const { xData, yData } = JSON.parse(getSession(LEFT_KEY2));
+            const { xData, yData } = getSession(LEFT_KEY2) ? JSON.parse(getSession(LEFT_KEY2)) : {};
             initChart(xData, yData);
         }
     }
diff --git a/src/enum/pageEnum.ts b/src/enum/pageEnum.ts
index 8ca97ef..68edd3c 100644
--- a/src/enum/pageEnum.ts
+++ b/src/enum/pageEnum.ts
@@ -16,8 +16,9 @@ export function getBaseLogin() {
 
 //根据当前路径跳转登录页
 export function toLoginByNowPath(nowPath: string) {
+    console.log('nowPath', nowPath);
     //西安的页面路径
-    const xianPath = ['/home', '/secondScreen'];
+    const xianPath = ['/home', '/secondScreen', '/'];
     //银川的页面路径
     const yinchuanPath = ['/yinChuanHome'];
     if (xianPath.includes(nowPath)) {
diff --git a/src/views/index.vue b/src/views/index.vue
index 4f8d480..7a56785 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -83,7 +83,7 @@
     }
 
     // 健康监测工具报警
-    const { socketData, setSocketData, closeSocket } = useSocket(basicPath);
+    const { socketData, setSocketData, closeSocket } = useSocket(basicPath + `${DataType.xian}`);
     const employeeDialogRef = ref();
     watch(socketData, (nVal) => {
         if (nVal) {
@@ -94,8 +94,8 @@
         }
     });
 
-    //应急求助
-    const { socketData: emergencyData, setSocketData: setEmergencyData, closeSocket: closeSocket2 } = useSocket(emergencyPath);
+    //应急求助 + `/${DataType.xian}`
+    const { socketData: emergencyData, setSocketData: setEmergencyData, closeSocket: closeSocket2 } = useSocket(emergencyPath + `${DataType.xian}`);
     const emergencyDialogRef = ref();
 
     watch(emergencyData, (nVal) => {
diff --git a/src/views/yinChuan/yinChuan.vue b/src/views/yinChuan/yinChuan.vue
index a4743dc..00bfc34 100644
--- a/src/views/yinChuan/yinChuan.vue
+++ b/src/views/yinChuan/yinChuan.vue
@@ -89,7 +89,7 @@
     }
 
     // 健康监测工具报警
-    const { socketData, setSocketData, closeSocket } = useSocket(basicPath);
+    const { socketData, setSocketData, closeSocket } = useSocket(basicPath + `${DataType.yinChuan}`);
     const employeeDialogRef = ref();
     watch(socketData, (nVal) => {
         if (nVal) {
@@ -101,7 +101,11 @@
     });
 
     //应急求助
-    const { socketData: emergencyData, setSocketData: setEmergencyData, closeSocket: closeSocket2 } = useSocket(emergencyPath);
+    const {
+        socketData: emergencyData,
+        setSocketData: setEmergencyData,
+        closeSocket: closeSocket2,
+    } = useSocket(emergencyPath + `${DataType.yinChuan}`);
     const emergencyDialogRef = ref();
 
     watch(emergencyData, (nVal) => {