From 1eff24c36d5802f88c13b3e62c8bd10637636b6d Mon Sep 17 00:00:00 2001
From: yy <11@11.com>
Date: Wed, 29 May 2024 10:47:41 +0800
Subject: [PATCH] hospitalID

---
 src/api/login.ts              |  4 ++++
 src/api/user.ts               |  4 ++--
 src/stores/remote-ws-store.ts | 20 ++++++++++----------
 src/stores/user-info-store.ts |  3 ++-
 src/views/index.vue           |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 71a2340..ed0a9da 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,6 +1,7 @@
 import * as other from "@/utils/other";
 import {ElMessage} from "element-plus";
 import request, {CommonHeaderEnum, postData} from "@/utils/request";
+import { Local, Session } from "@/utils/storage";
 
 const registerUrl = "/admin/register/user"
 
@@ -8,6 +9,9 @@ const logoutUrl = "/admin/token/logout"
 
 export const login = (data: any) => {
     return new Promise(resolve => {
+        Local.clear()
+        Session.clear()
+
         const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT);
 
         let encPassword = data.password;
diff --git a/src/api/user.ts b/src/api/user.ts
index b83ec01..aafecc7 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -66,7 +66,7 @@ export function userPage(data: any) {
         }).then((res: any) => {
             resolve(res.data)
         }).catch(err => {
-            console.log(err)
+            resolve(err)
         })
     })
 }
@@ -77,7 +77,7 @@ export function userList(data: any): Promise<any> {
             .then((res: any) => {
                 resolve(res.data)
             }).catch(err => {
-                console.log(err)
+                resolve(err)
             })
     })
 }
diff --git a/src/stores/remote-ws-store.ts b/src/stores/remote-ws-store.ts
index cf2a01f..763be5b 100644
--- a/src/stores/remote-ws-store.ts
+++ b/src/stores/remote-ws-store.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { Local, Session } from "@/utils/storage";
+import { Session } from "@/utils/storage";
 
 const vitalUrl = "ws://localhost:5173/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken()
 const medicineUrl = "ws://localhost:5173/socket.io/admin/rax/addMedicine?token=" + Session.getToken()
@@ -24,26 +24,26 @@ export const useRemoteWsStore = defineStore("remoteWs", {
 	actions: {
 		setCurrentTaskIndex(i: number) {
 			this.currentTaskIndex = i
-			Local.set("currentTaskIndex", i)
+			Session.set("currentTaskIndex", i)
 		},
 		getCurrentTaskIndex() {
-			if (Local.get("currentTaskIndex")) {
-				this.currentTaskIndex = Local.get("currentTaskIndex")
+			if (Session.get("currentTaskIndex")) {
+				this.currentTaskIndex = Session.get("currentTaskIndex")
 			}
 			return this.currentTaskIndex
 		},
 		setRemoteTask() {
-			Local.set("remoteTasks", this.remoteTasks)
+			Session.set("remoteTasks", this.remoteTasks)
 		},
 		getRemoteTask() {
-			if (Local.get("remoteTasks")) {
-				this.remoteTasks = Local.get("remoteTasks")
+			if (Session.get("remoteTasks")) {
+				this.remoteTasks = Session.get("remoteTasks")
 			}
 			return this.remoteTasks
 		},
 		initRemoteTask() {
-			if (Local.get("remoteTasks")) {
-				this.remoteTasks = Local.get("remoteTasks")
+			if (Session.get("remoteTasks")) {
+				this.remoteTasks = Session.get("remoteTasks")
 			}
 			if (this.remoteTasks.length <= 0) {
 				for (let i = 0; i < 10; i++) {
@@ -79,7 +79,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
 				index: i,
 				message: []
 			})
-			Local.set("remoteTasks", this.remoteTasks)
+			Session.set("remoteTasks", this.remoteTasks)
 		},
 		getActiveRemoteTask() {
 			for (let i = 0; i < this.remoteTasks.length; i++) {
diff --git a/src/stores/user-info-store.ts b/src/stores/user-info-store.ts
index 9346810..3ee9e5d 100644
--- a/src/stores/user-info-store.ts
+++ b/src/stores/user-info-store.ts
@@ -1,6 +1,6 @@
 import {defineStore} from 'pinia'
 import {getUserMenu} from "@/api/menu";
-import {Session} from "@/utils/storage";
+import {Local, Session} from "@/utils/storage";
 import router from "@/router";
 
 export const useUserStore = defineStore('login', {
@@ -37,6 +37,7 @@ export const useUserStore = defineStore('login', {
     },
     logout() {
       Session.clear();
+      Local.clear();
       router.removeRoute("root");
       router.addRoute({
         name: "root",
diff --git a/src/views/index.vue b/src/views/index.vue
index 3908d9b..db33a8f 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -113,7 +113,7 @@ async function getHospitalList() {
     hospitals.value = [];
     if (res.code == 0 && res.data.length > 0) {
       hospitals.value = res.data;
-      if (data.data) {
+      if (data.data && data.data != 'null') {
         hospital.value = data.data;
       }
       preHospital.value = hospital.value