From 298074da1f5b3fac9ed9a232aa3bb28e0b46ab5c Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Tue, 23 Apr 2024 09:42:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/patient.ts                            |   17 +
 src/router/index.ts                           |   40 +-
 src/router/routes.ts                          |    4 +-
 src/stores/remote-ws-store.ts                 |  214 +++
 src/stores/user-info-store.ts                 |    2 -
 src/views/index.vue                           |   57 +-
 src/views/login/login.vue                     |  851 +++++-----
 src/views/remote-manage/chart/chart-ecg.vue   |  344 ++--
 src/views/remote-manage/chart/chart-line.vue  |  185 +--
 .../remote-manage/part/message-item-part.vue  |   64 +-
 src/views/remote-manage/part/message-part.vue |   58 +-
 .../remote-manage/part/remote-dialog.vue      |  130 +-
 .../remote-manage/part/remote-item-part.vue   |  202 ++-
 src/views/remote-manage/part/remote-part.vue  |  341 ++--
 src/views/remote-manage/remote-control.vue    | 1443 ++++++++---------
 src/views/remote-manage/remote-manage.vue     |  253 +--
 src/views/remote-manage/remote-thumbnail.vue  |   82 +-
 17 files changed, 2093 insertions(+), 2194 deletions(-)
 create mode 100644 src/api/patient.ts
 create mode 100644 src/stores/remote-ws-store.ts

diff --git a/src/api/patient.ts b/src/api/patient.ts
new file mode 100644
index 0000000..1adaa35
--- /dev/null
+++ b/src/api/patient.ts
@@ -0,0 +1,17 @@
+import request from "@/utils/request";
+
+const patientInfoUrl = "/admin/medicine/getPatientInfo";
+
+export function getPatientInfo(name: string, id: string, date: string) {
+	return new Promise((resolve, reject) => {
+		request.postForm(patientInfoUrl, {
+			patientName: name,
+			idNum: id,
+			date: date
+		})
+	}).then((res: any) => {
+		console.log(res.data)
+	}).catch(error => {
+		reject(error)
+	})
+}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 7230c80..2ae2c50 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,7 +10,7 @@ const router = createRouter({
 
 router.beforeEach((to, from, next) => {
     const loginInfo = useLoginStore().getlogin()
-    const isLogin = loginInfo.isLogin
+//    const isLogin = loginInfo.isLogin
     // 普通用户
     const commonUser = [
         '/login',
@@ -49,31 +49,31 @@ router.beforeEach((to, from, next) => {
         '/logs-manage/logs-manage'
     ]
     const isViewRoute = () => {
-        let release = false
-        switch (loginInfo.permissions) {
-            case '超级管理员':
-                release = true
-                break;
-            case '高级管理员':
-                release = SeniorAdmin.some((p: string) => p === to.path)
-                break;
-            case '中级管理员':
-                release = IntermediateAdmin.some((p: string) => p === to.path)
-                break;
-            case '普通用户':
-                release = commonUser.some((p: string) => p === to.path)
-                break;
-            default:
-                break;
-        }
+        let release = true
+			/*switch (loginInfo.permissions) {
+				case '超级管理员':
+					release = true
+					break;
+				case '高级管理员':
+					release = SeniorAdmin.some((p: string) => p === to.path)
+					break;
+				case '中级管理员':
+					release = IntermediateAdmin.some((p: string) => p === to.path)
+					break;
+				case '普通用户':
+					release = commonUser.some((p: string) => p === to.path)
+					break;
+				default:
+					break;
+			}*/
         return release
     }
     if(to.fullPath ==='/login') {
         next()
         return
     }
-    if (!isLogin) next('/login') // 重定向登录页
-    else if(!isViewRoute()) {
+    /*if (!isLogin) next('/login') // 重定向登录页
+    else */if(!isViewRoute()) {
         ElMessage.error('无权访问！')
         next(from.fullPath)
     }else next()
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 047133e..4624a73 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,6 +1,6 @@
 export const constantRoute=[
 
-    { path: '/:pathMatch(.*)*', name: 'not-found', redirect: '/home' },
+    { path: '/:pathMatch(.*)*', name: 'not-found', redirect: '/login' },
     {
         path: '/login',
         name: '登录',
@@ -8,7 +8,7 @@ export const constantRoute=[
     },
     {
         path: '/',
-        redirect: '/home',
+        redirect: '/login',
         component: () => import('@/views/index.vue'),
         children: [
             {
diff --git a/src/stores/remote-ws-store.ts b/src/stores/remote-ws-store.ts
new file mode 100644
index 0000000..0e586ab
--- /dev/null
+++ b/src/stores/remote-ws-store.ts
@@ -0,0 +1,214 @@
+import {defineStore} from "pinia";
+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()
+const chatUrl = "ws://localhost:5173/socket.io/admin/rax/chatRoom?token=" + Session.getToken()
+
+export const useRemoteWsStore = defineStore("remoteWs", {
+	state: () => {
+		return {
+			patient: {} as any,
+			remoteTasks: [] as any,
+			remoteTasksCap: 10,
+			currentTaskIndex: 0,
+			varMedicine: ["丙泊酚", "舒芬太尼", "瑞芬太尼", "顺阿曲库胺"],
+			fixedMedicine: ["尼卡地平", "艾司洛尔", "麻黄素", "阿托品"],
+			exceptionType: ["BIS_except", "DBP_except", "EtCO2_except", "HR_except", "SBP_except", "ST_except"],
+			exceptionMsg: {
+				"BIS_except": "脑电双频指数异常", "DBP_except": "舒张压异常", "EtCO2_except": "呼气末二氧化碳异常",
+				"HR_except": "心率异常", "SBP_except": "收缩压异常", "ST_except": "ST异常"
+			},
+		}
+	},
+	actions: {
+		initRemoteTask() {
+			if (this.remoteTasks.length <= 0) {
+				for (let i = 0; i < 10; i++) {
+					this.remoteTasks.push({
+						isRemote: false,
+						isException: false,
+						taskName: "",
+						server: "",
+						serverun: "",
+						serverps: "",
+						patient: "",
+						patientId: "",
+						date: "",
+						log: [],
+						index: i
+					})
+				}
+			}
+			return this.remoteTasks
+		},
+		resetRemoteTask(i: number) {
+			this.remoteTasks[i] = Object.assign(this.remoteTasks[i], {
+				isRemote: false,
+				isException: false,
+				taskName: "",
+				server: "",
+				serverun: "",
+				serverps: "",
+				patient: "",
+				patientId: "",
+				date: "",
+				log: [],
+				index: i,
+				message: []
+			})
+		},
+		getActiveRemoteTask() {
+			for (let i = 0; i < this.remoteTasks.length; i++) {
+				if (this.remoteTasks[i].isRemote) return i
+			}
+		},
+		setRemoteLog(log: any, i: number) {
+			this.remoteTasks[i].log.push(log)
+		},
+		createConnect(name: string, id: string, date: string) {
+			if (!this.patient[name + id + date]) {
+				const vitalWS = new WebSocket(vitalUrl)
+				const medicineWS = new WebSocket(medicineUrl)
+				const chatWS = new WebSocket(chatUrl)
+				vitalWS.onopen = function () {
+					vitalWS.send(JSON.stringify({
+						patientName: name,
+						idNum: id,
+						date: date
+					}))
+				}
+				medicineWS.onopen = function () {
+					medicineWS.send(JSON.stringify({
+						patientName: name,
+						idNum: id,
+						date: date
+					}))
+				}
+				chatWS.onopen = function () {
+					chatWS.send(JSON.stringify({
+						patientName: name,
+						idNum: id,
+						date: date
+					}))
+				}
+				this.patient[name + id + date] = {
+					vitalWS,
+					medicineWS,
+					chatWS
+				}
+			}
+		},
+		disconnect(name: string, id: string, date: string) {
+			const patient: any = this.patient[name + id + date]
+			if (patient) {
+				patient.vitalWS.close()
+				patient.medicineWS.close()
+				patient.chatWS.close()
+				delete this.patient[name + id + date]
+			}
+		},
+		subscribeVital(name: string, id: string, date: string, cb: any) {
+			const patient: any = this.patient[name + id + date]
+			if (patient) {
+				patient.vitalWS.onmessage = cb
+				patient.vitalCB = cb
+			} else {
+				cb({
+					status: 1,
+					msg: "已断开连接"
+				})
+			}
+		},
+		unsubscribeVital(name: string, id: string, date: string) {
+			const patient: any = this.patient[name + id + date]
+			if (patient && patient.vitalWS) {
+				patient.vitalWS.onmessage = undefined;
+				patient.vitalCB = undefined;
+			}
+		},
+		sendMsg(name: string, id: string, date: string, msg: string, cb: any) {
+			const patient: any = this.patient[name + id + date]
+			if (patient) {
+				const params = {
+					patientName: name,
+					idNum: id,
+					date: date,
+					msg
+				}
+				patient.chatWS.send(JSON.stringify(params))
+				cb({
+					status: 0
+				})
+			} else {
+				cb({
+					status: 1,
+					msg: "已断开连接"
+				})
+			}
+		},
+		subscribeChat(name: string, id: string, date: string, cb: any) {
+			const patient: any = this.patient[name + id + date]
+			if (patient) {
+				patient.chatCB = cb
+				patient.chatWS.onmessage = cb
+			} else {
+				cb({
+					status: 1,
+					msg: "已断开连接"
+				})
+			}
+		},
+		unsubscribeChat(name: string, id: string, date: string) {
+			const patient: any = this.patient[name + id + date]
+			patient.chatCB = undefined;
+			patient.chatWS.onmessage = undefined;
+		},
+		sendMedicine(args: {
+			name: string,
+			id: string,
+			date: string,
+			flag: string,
+			medicine: string,
+			value: string
+		}, cb: any) {
+			const patient: any = this.patient[args.name + args.id + args.date]
+			if (patient) {
+				const params = {
+					patientName: args.name,
+					idNum: args.id,
+					date: args.date,
+					flag: args.flag,
+					medicine: args.medicine,
+					value: args.value
+				}
+				patient.medicineWS.send(JSON.stringify(params))
+				cb({
+					status: 0
+				})
+			} else {
+				cb({
+					status: 1,
+					msg: "已断开连接"
+				})
+			}
+		},
+		subscribeMedicine(name: string, id: string, date: string, cb: any) {
+			const patient = this.patient[name + id + date]
+			if (patient) {
+				patient.medicineCB = cb
+				patient.medicineWS.onmessage = cb
+			} else {
+				cb({
+					status: 1,
+					msg: "已断开连接"
+				})
+			}
+		},
+		unsubscribeMedicine(name: string, id: string, date: string) {
+			const patient: any = this.patient[name + id + date]
+			patient.medicineCB = undefined;
+			patient.medicineWS.onmessage = undefined;
+		}
+	}
+})
\ No newline at end of file
diff --git a/src/stores/user-info-store.ts b/src/stores/user-info-store.ts
index e0d25c8..0f99bff 100644
--- a/src/stores/user-info-store.ts
+++ b/src/stores/user-info-store.ts
@@ -4,7 +4,6 @@ export const useLoginStore = defineStore('login', {
   state: () => {
     return {
       login: {
-        isLogin: false,
         account: '',
         name: '',
         /**
@@ -13,7 +12,6 @@ export const useLoginStore = defineStore('login', {
          * 医院中级管理员： 首页、患者管理、远程管理
          * 医院普通用户： 首页、患者管理
          */
-        permissions: '',
         hospital: ''
       } as any
     }
diff --git a/src/views/index.vue b/src/views/index.vue
index 4233d57..464c5f1 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -82,32 +82,37 @@ getHospitalsData().then((res: any) => {
 
 const menus = [] as any
 switch (userInfo.permissions) {
-  case '超级管理员':
-    menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
-    menus.push({label: '权限管理', path: '/permissions-manage', icon: 'icon-users'})
-    menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
-    menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
-    menus.push({label: '后台管理', path: '/system-manage', icon: 'icon-houtaiguanli'})
-    menus.push({label: '系统管理', path: '/logs-manage', icon: 'icon-setting'})
-    break;
-  case '高级管理员':
-    menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
-    menus.push({label: '权限管理', path: '/permissions-manage', icon: 'icon-users'})
-    menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
-    menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
-    menus.push({label: '系统管理', path: '/logs-manage', icon: 'icon-setting'})
-    break;
-  case '中级管理员':
-    menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
-    menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
-    menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
-    break;
-  case '普通用户':
-    menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
-    menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
-    break;
-  default:
-    break;
+	case '超级管理员':
+		menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
+		menus.push({label: '权限管理', path: '/permissions-manage', icon: 'icon-users'})
+		menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
+		menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
+		menus.push({label: '后台管理', path: '/system-manage', icon: 'icon-houtaiguanli'})
+		menus.push({label: '系统管理', path: '/logs-manage', icon: 'icon-setting'})
+		break;
+	case '高级管理员':
+		menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
+		menus.push({label: '权限管理', path: '/permissions-manage', icon: 'icon-users'})
+		menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
+		menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
+		menus.push({label: '系统管理', path: '/logs-manage', icon: 'icon-setting'})
+		break;
+	case '中级管理员':
+		menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
+		menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
+		menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
+		break;
+	case '普通用户':
+		menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
+		menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
+		break;
+	default:
+		menus.push({label: '首页', path: '/home', icon: 'icon-shouye'})
+		menus.push({label: '权限管理', path: '/permissions-manage', icon: 'icon-users'})
+		menus.push({label: '患者管理', path: '/patients-manage', icon: 'icon-renyuanguanli'})
+		menus.push({label: '远程管理', path: '/remote-manage', icon: 'icon-anquanbaozhang'})
+		menus.push({label: '后台管理', path: '/system-manage', icon: 'icon-houtaiguanli'})
+		menus.push({label: '系统管理', path: '/logs-manage', icon: 'icon-setting'})
 }
 
 const isShowUserInfoDrawer = ref(false)
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index a176562..0d292c4 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -1,127 +1,127 @@
 <template>
-  <div class="login-page">
-    <div class="left-content move_4"></div>
-    <div class="right-content">
-      <div class="select-hospital-box">
-        <el-select class="select-hospital" v-model="currentHospital" size="small" @change="selectHospital">
-          <el-option v-for="item in hospitals" :key="item.id" :label="item.name" :value="item.id"/>
-        </el-select>
-      </div>
+	<div class="login-page">
+		<div class="left-content move_4"></div>
+		<div class="right-content">
+<!--			<div class="select-hospital-box">
+				<el-select class="select-hospital" v-model="currentHospital" size="small" @change="selectHospital">
+					<el-option v-for="item in hospitals" :key="item.id" :label="item.name" :value="item.id"/>
+				</el-select>
+			</div>-->
 
-      <img v-show="!isShowRegister" class="logo move_2" src="@/assets/imgs/logo.png">
-      <div v-if="!isShowRegister" class="login-block move_2">
-        <div class="login-way">
-          <span :class="passwordLogin && 'active'" @click="passwordLogin = true">密码登录</span>
-          <span :class="!passwordLogin && 'active'" @click="passwordLogin = false">验证码登录</span>
-        </div>
-        <el-form ref="loginFormRef" :model="loginParams" :rules="loginRules" label-width="0" size="small">
-          <div class="login-form password-login" v-if="passwordLogin">
-            <el-form-item prop="account">
-              <el-input v-model="loginParams.account" placeholder="请输入用户名">
-                <template #prepend>
-                  <el-icon>
-                    <User/>
-                  </el-icon>
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="password">
-              <el-input v-model="loginParams.password" type="password" show-password placeholder="请输入密码">
-                <template #prepend>
-                  <el-icon>
-                    <Lock/>
-                  </el-icon>
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-button :loading="loading" class="login-btn" type="primary" @click="login('password')">登录</el-button>
-            <span class="register-btn" @click="getCaptchaCode()">注册账号</span>
-          </div>
-          <div class="login-form code-login" v-else>
-            <el-form-item prop="phone">
-              <el-input v-model="loginParams.phone" placeholder="请输入手机号">
-                <template #prepend>
-                  <div @click.stop style="display: flex;align-items: center;">
-                    <el-dropdown @command="selectPhoneArea">
+			<img v-show="!isShowRegister" class="logo move_2" src="@/assets/imgs/logo.png">
+			<div v-if="!isShowRegister" class="login-block move_2">
+				<div class="login-way">
+					<span :class="passwordLogin && 'active'" @click="passwordLogin = true">密码登录</span>
+					<span :class="!passwordLogin && 'active'" @click="passwordLogin = false">验证码登录</span>
+				</div>
+				<el-form ref="loginFormRef" :model="loginParams" :rules="loginRules" label-width="0" size="small">
+					<div class="login-form password-login" v-if="passwordLogin">
+						<el-form-item prop="account">
+							<el-input v-model="loginParams.account" placeholder="请输入用户名">
+								<template #prepend>
+									<el-icon>
+										<User/>
+									</el-icon>
+								</template>
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="password">
+							<el-input v-model="loginParams.password" type="password" show-password placeholder="请输入密码">
+								<template #prepend>
+									<el-icon>
+										<Lock/>
+									</el-icon>
+								</template>
+							</el-input>
+						</el-form-item>
+						<el-button :loading="loading" class="login-btn" type="primary" @click="login('password')">登录</el-button>
+						<span class="register-btn" @click="getCaptchaCode()">注册账号</span>
+					</div>
+					<div class="login-form code-login" v-else>
+						<el-form-item prop="phone">
+							<el-input v-model="loginParams.phone" placeholder="请输入手机号">
+								<template #prepend>
+									<div @click.stop style="display: flex;align-items: center;">
+										<el-dropdown @command="selectPhoneArea">
                                                   <span style="color: #909399;">{{ loginParams.phoneArea }}<el-icon>
                                                           <DCaret/>
                                                       </el-icon></span>
-                      <template #dropdown>
-                        <el-dropdown-menu>
-                          <el-dropdown-item v-for="item in phoneAreas" :command="item">{{
-                              item
-                            }}
-                          </el-dropdown-item>
-                        </el-dropdown-menu>
-                      </template>
-                    </el-dropdown>
-                  </div>
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="code">
-              <el-input v-model="loginParams.code" placeholder="请输入6位短信验证码">
-                <template #append>
-                  <span class="send-btn" @click="sendCode">{{ loginParams.sendText }}</span>
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-button class="login-btn" type="primary" @click="login('code')">登录</el-button>
-          </div>
-        </el-form>
-      </div>
-      <div v-else class="register-block move_2">
-        <div class="header-box">
-          <span class="title">新用户申请</span>
-          <el-icon @click="isShowRegister = false">
-            <Close/>
-          </el-icon>
-        </div>
+											<template #dropdown>
+												<el-dropdown-menu>
+													<el-dropdown-item v-for="item in phoneAreas" :command="item">{{
+															item
+														}}
+													</el-dropdown-item>
+												</el-dropdown-menu>
+											</template>
+										</el-dropdown>
+									</div>
+								</template>
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="code">
+							<el-input v-model="loginParams.code" placeholder="请输入6位短信验证码">
+								<template #append>
+									<span class="send-btn" @click="sendCode">{{ loginParams.sendText }}</span>
+								</template>
+							</el-input>
+						</el-form-item>
+						<el-button class="login-btn" type="primary" @click="login('code')">登录</el-button>
+					</div>
+				</el-form>
+			</div>
+			<div v-else class="register-block move_2">
+				<div class="header-box">
+					<span class="title">新用户申请</span>
+					<el-icon @click="isShowRegister = false">
+						<Close/>
+					</el-icon>
+				</div>
 
-        <el-form ref="registerFormRef" :model="registerParams" :rules="registerRules" label-width="100">
-          <el-form-item label="用户名" prop="username">
-            <el-input v-model="registerParams.username" placeholder="请输入用户名"></el-input>
-          </el-form-item>
-          <el-form-item label="密码" prop="password">
-            <el-input v-model="registerParams.password" type="password" show-password
-                      placeholder="请输入密码"></el-input>
-          </el-form-item>
-          <el-form-item label="姓名" prop="name">
-            <el-input v-model="registerParams.name" placeholder="请输入姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="手机号" prop="phone">
-            <el-input v-model="registerParams.phone" placeholder="请输入手机号"></el-input>
-          </el-form-item>
-          <el-form-item label="医院" prop="hospital">
-            <el-select v-model="registerParams.hospital" style="width: 100%;">
-              <el-option v-for="item in hospitals" :key="item.id" :label="item.name"
-                         :value="item.id"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="性别" prop="sex">
-            <el-radio-group v-model="registerParams.sex">
-              <el-radio label="男"/>
-              <el-radio label="女"/>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="验证码" prop="code">
-            <el-input v-model="registerParams.code" placeholder="请输入验证码"
-                      style="width: calc(100% - 110px);"></el-input>
-            <img width="100" height="32" style="margin-left: 10px;" :src="captchaImgUrl"/>
-            <a class="change_img" @click="refreshImg" href="#">看不清？</a>
-          </el-form-item>
+				<el-form ref="registerFormRef" :model="registerParams" :rules="registerRules" label-width="100">
+					<el-form-item label="用户名" prop="username">
+						<el-input v-model="registerParams.username" placeholder="请输入用户名"></el-input>
+					</el-form-item>
+					<el-form-item label="密码" prop="password">
+						<el-input v-model="registerParams.password" type="password" show-password
+											placeholder="请输入密码"></el-input>
+					</el-form-item>
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="registerParams.name" placeholder="请输入姓名"></el-input>
+					</el-form-item>
+					<el-form-item label="手机号" prop="phone">
+						<el-input v-model="registerParams.phone" placeholder="请输入手机号"></el-input>
+					</el-form-item>
+					<el-form-item label="医院" prop="hospital">
+						<el-select v-model="registerParams.hospital" style="width: 100%;">
+							<el-option v-for="item in hospitals" :key="item.id" :label="item.name"
+												 :value="item.id"/>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="性别" prop="sex">
+						<el-radio-group v-model="registerParams.sex">
+							<el-radio label="男"/>
+							<el-radio label="女"/>
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item label="验证码" prop="code">
+						<el-input v-model="registerParams.code" placeholder="请输入验证码"
+											style="width: calc(100% - 110px);"></el-input>
+						<img width="100" height="32" style="margin-left: 10px;" :src="captchaImgUrl"/>
+						<a class="change_img" @click="refreshImg" href="#">看不清？</a>
+					</el-form-item>
 
-        </el-form>
-        <div class="footer-box">
-          <el-button type="primary" @click="register">注 册</el-button>
-          <span @click="isShowRegister = false">已有账号?</span>
-        </div>
-      </div>
+				</el-form>
+				<div class="footer-box">
+					<el-button type="primary" @click="register">注 册</el-button>
+					<span @click="isShowRegister = false">已有账号?</span>
+				</div>
+			</div>
 
-    </div>
-  </div>
-  <SliderVerify v-model:isShowSelf="sliderVConf.isShowSelf" :width="sliderVConf.width" :imgUrl="sliderImgUrl"
-                :height="sliderVConf.height" @success="sliderSuccess" @close="sliderClose"></SliderVerify>
+		</div>
+	</div>
+	<SliderVerify v-model:isShowSelf="sliderVConf.isShowSelf" :width="sliderVConf.width" :imgUrl="sliderImgUrl"
+								:height="sliderVConf.height" @success="sliderSuccess" @close="sliderClose"></SliderVerify>
 </template>
 
 <script lang='ts' setup>
@@ -153,74 +153,74 @@ let loading = ref(false);
 
 //自定义校验规则函数
 const validatorUserName = (rule: any, value: any, callback: any) => {
-  //rule:即为校验规则对象
-  //value:即为表单元素文本内容
-  //函数:如果符合条件callBack放行通过即为
-  //如果不符合条件callBack方法,注入错误提示信息
-  if (/^[a-zA-Z0-9_-]{4,16}$/) {
-    callback();
-  } else {
-    callback(new Error('账号长度4到16位（字母，数字，下划线，减号）'));
-  }
+	//rule:即为校验规则对象
+	//value:即为表单元素文本内容
+	//函数:如果符合条件callBack放行通过即为
+	//如果不符合条件callBack方法,注入错误提示信息
+	if (/^[a-zA-Z0-9_-]{4,16}$/) {
+		callback();
+	} else {
+		callback(new Error('账号长度4到16位（字母，数字，下划线，减号）'));
+	}
 }
 
 const validatorPassword = (rule: any, value: any, callback: any) => {
-  if (/^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/) {
-    callback();
-  } else {
-    callback(new Error('密码最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符'));
-  }
+	if (/^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/) {
+		callback();
+	} else {
+		callback(new Error('密码最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符'));
+	}
 }
 
 const validatorPhone = (rule: any, value: any, callback: any) => {
-  var isPhone = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
+	var isPhone = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
 
 
-  if (value.indexOf('****') >= 0) {
-    return callback().trim();
-  }
+	if (value.indexOf('****') >= 0) {
+		return callback().trim();
+	}
 
-  if (!isPhone.test(value)) {
-    callback(new Error('请输入合法手机号'));
-  } else {
-    callback();
-  }
+	if (!isPhone.test(value)) {
+		callback(new Error('请输入合法手机号'));
+	} else {
+		callback();
+	}
 
 }
 
 const loginRules = reactive({
-  account: [
-    {required: true, validator: validatorUserName, trigger: 'change'},
-  ],
-  password: [
-    {required: true, validator: validatorPassword, trigger: 'change'},
-  ],
-  phone: [
-    {required: true, validator: validatorPhone, trigger: 'blur'},
-  ],
-  code: [
-    {required: true, message: '请输入验证码', trigger: 'blur'},
-  ]
+	account: [
+		{required: true, validator: validatorUserName, trigger: 'change'},
+	],
+	password: [
+		{required: true, validator: validatorPassword, trigger: 'change'},
+	],
+	phone: [
+		{required: true, validator: validatorPhone, trigger: 'blur'},
+	],
+	code: [
+		{required: true, message: '请输入验证码', trigger: 'blur'},
+	]
 })
 const registerRules = reactive({
-  username: [
-    {required: true, validator: validatorUserName, trigger: 'change'},
-  ],
-  password: [
-    {required: true, validator: validatorUserName, trigger: 'change'},
-  ],
-  name: [
-    {required: true, message: '请输入用户名', trigger: 'blur'},
-  ],
-  phone: [
-    {required: true, validator: validatorPhone, trigger: 'change'},
-  ],
-  hospital: [
-    {required: true, message: '请选择医院', trigger: 'blur'},
-  ],
-  code: [
-    {required: true, message: '请输入验证码', trigger: 'blur'},
-  ]
+	username: [
+		{required: true, validator: validatorUserName, trigger: 'change'},
+	],
+	password: [
+		{required: true, validator: validatorUserName, trigger: 'change'},
+	],
+	name: [
+		{required: true, message: '请输入用户名', trigger: 'blur'},
+	],
+	phone: [
+		{required: true, validator: validatorPhone, trigger: 'change'},
+	],
+	hospital: [
+		{required: true, message: '请选择医院', trigger: 'blur'},
+	],
+	code: [
+		{required: true, message: '请输入验证码', trigger: 'blur'},
+	]
 })
 
 //获取路由器
@@ -234,29 +234,29 @@ const currentHospital = ref(useLoginStore().getlogin().hospital)
 const isShowRegister = ref(false)
 const passwordLogin = ref(true)
 const loginParams = ref({
-  account: 'admin',
-  name: '',
-  password: '123456',
-  phone: '',
-  phoneArea: phoneAreas[0],
-  code: '',
-  isSendCode: false,
-  sendTimer: 0,
-  sendText: '获取短信验证码'
+	account: 'admin',
+	name: '',
+	password: '123456',
+	phone: '',
+	phoneArea: phoneAreas[0],
+	code: '',
+	isSendCode: false,
+	sendTimer: 0,
+	sendText: '获取短信验证码'
 })
 const registerParams = ref({
-  username: '',
-  password: '',
-  name: '',
-  phone: '',
-  hospital: '',
-  sex: '',
-  code: ''
+	username: '',
+	password: '',
+	name: '',
+	phone: '',
+	hospital: '',
+	sex: '',
+	code: ''
 })
 const sliderVConf = ref({
-  isShowSelf: false,
-  width: 400,
-  height: 200
+	isShowSelf: false,
+	width: 400,
+	height: 200
 })
 
 const captchaImgUrl = ref('')
@@ -264,312 +264,289 @@ const sliderImgUrl = ref('')
 let randomStr = ""
 
 onMounted(() => {
-  hospitalApi.getHospitalList().then((res: any) => {
-    if (res.data) {
-      hospitals.value = res.data
-    } else {
-      hospitals.value.length = 0
-    }
-  })
+	hospitalApi.getHospitalList().then((res: any) => {
+		if (res.data) {
+			hospitals.value = res.data
+		} else {
+			hospitals.value.length = 0
+		}
+	})
 })
 
 const selectHospital = (e: string) => {
-  // console.log(e)
+	// console.log(e)
 }
 const register = async () => {
-  await registerFormRef.value.validate((valid: any, fields: any) => {
-    if (valid) {
-      loginApi.register({...registerParams.value, randomStr}).then(data => {
-        ElMessageBox.confirm(
-            '注册成功，是否登录？',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'success',
-              draggable: true
-            }
-        ).then(() => {
-          loginParams.value.account = registerFormRef.value.account
-          loginParams.value.name = registerFormRef.value.name
-          currentHospital.value = registerFormRef.value.hospital
-          isShowRegister.value = false;
-        }).catch(() => {
-        })
-      })
-    } else {
-      // console.log('error submit!', fields)
-    }
-  })
+	await registerFormRef.value.validate((valid: any, fields: any) => {
+		if (valid) {
+			loginApi.register({...registerParams.value, randomStr}).then(data => {
+				ElMessageBox.confirm(
+					'注册成功，是否登录？',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'success',
+						draggable: true
+					}
+				).then(() => {
+					loginParams.value.account = registerFormRef.value.account
+					loginParams.value.name = registerFormRef.value.name
+					currentHospital.value = registerFormRef.value.hospital
+					isShowRegister.value = false;
+				}).catch(() => {
+				})
+			})
+		} else {
+			// console.log('error submit!', fields)
+		}
+	})
 }
 const selectPhoneArea = (e: string) => {
-  loginParams.value.phoneArea = e
+	loginParams.value.phoneArea = e
 }
 const sendCode = () => {
-  if (loginParams.value.isSendCode) return
-  let num = 60
-  ElMessage.success('发送成功！')
-  loginParams.value.isSendCode = true
-  loginParams.value.sendText = '请' + num + '秒后重新发送'
-  loginParams.value.sendTimer = setInterval(() => {
-    num--
-    if (num > 0) {
-      loginParams.value.sendText = '请' + num + '秒后重新发送'
-    } else {
-      loginParams.value.isSendCode = false
-      loginParams.value.sendText = '重新获取短信验证码'
-      clearInterval(loginParams.value.sendTimer)
-    }
+	if (loginParams.value.isSendCode) return
+	let num = 60
+	ElMessage.success('发送成功！')
+	loginParams.value.isSendCode = true
+	loginParams.value.sendText = '请' + num + '秒后重新发送'
+	loginParams.value.sendTimer = setInterval(() => {
+		num--
+		if (num > 0) {
+			loginParams.value.sendText = '请' + num + '秒后重新发送'
+		} else {
+			loginParams.value.isSendCode = false
+			loginParams.value.sendText = '重新获取短信验证码'
+			clearInterval(loginParams.value.sendTimer)
+		}
 
-  }, 1000);
+	}, 1000);
 }
 const login = async (type: string) => {
-  //加载效果:开始加载
-  loading.value=true;
-  const obj = loginParams.value
-  if (!currentHospital.value) {
-    ElMessage.warning('请在右上角选择院区')
-    return
-  }
-  //加载效果:开始加载
-  loading.value = true;
-  //保证全部表单正常再发请求
-  await loginFormRef.value.validate((valid: any, fields: any) => {
-    if (valid) {
-      sliderVConf.value.isShowSelf = true;
-    }
-  })
+	//加载效果:开始加载
+	loading.value = true;
+	/*if (!currentHospital.value) {
+		ElMessage.warning('请在右上角选择院区')
+		return
+	}*/
+	//加载效果:开始加载
+	loading.value = true;
+	//保证全部表单正常再发请求
+	await loginFormRef.value.validate((valid: any, fields: any) => {
+		if (valid) {
+			sliderVConf.value.isShowSelf = true;
+		}
+	})
 
 }
 
 function getCaptchaCode() {
-  isShowRegister.value = true
-  refreshImg()
+	isShowRegister.value = true
+	refreshImg()
 }
 
 function refreshImg() {
-  randomStr = v4()
-  captchaImgUrl.value = '/api/admin/code/textImage?randomStr=' + randomStr
+	randomStr = v4()
+	captchaImgUrl.value = '/api/admin/code/textImage?randomStr=' + randomStr
 }
 
 function sliderSuccess() {
-  loginApi.login({
-    username: loginParams.value.account, // 用户名
-    password: loginParams.value.password, // 密码
-    randomStr: v4()
-  }).then((data: any) => {
-    sliderVConf.value.isShowSelf = false
-    if (data.code == 1 || data.error) {
-      ElMessage.error(data.msg ? data.msg : data.error)
-      loading.value = false
-    } else {
+	loginApi.login({
+		username: loginParams.value.account, // 用户名
+		password: loginParams.value.password, // 密码
+		randomStr: v4()
+	}).then((data: any) => {
+		sliderVConf.value.isShowSelf = false
+		if (data.code == 1 || data.error) {
+			ElMessage.error(data.msg ? data.msg : data.error)
+			loading.value = false
+		} else {
 // 存储token 信息
-      Session.set('token', data.access_token);
-      Session.set('refresh_token', data.refresh_token);
-      console.log(data)
-      toHome()
-    }
-  })
+			console.log(data)
+			ElNotification({
+					type: 'success',
+					message: '欢迎回来',
+					title: `HI,${getTime()}好`
+				});
+			loginPost(data)
+			router.push('/home')
+		}
+	})
 }
 
 function sliderClose() {
-  loading.value = false
+	loading.value = false
 }
 
-const toHome = () => {
-
-  ElNotification({
-    type: 'success',
-    message: '欢迎回来',
-    title: `HI,${getTime()}好`
-  });
-
-  const getPermissions = () => {
-    let permissions = '普通用户'
-    switch (loginParams.value.account) {
-
-      case 'admin':
-        permissions = '超级管理员'
-        break;
-      case 'dev1':
-        permissions = '高级管理员'
-        break;
-      case 'dev2':
-        permissions = '中级管理员'
-        break;
-      default:
-        break;
-    }
-    return permissions
-  }
-  useLoginStore().setlogin('isLogin', true)
-  useLoginStore().setlogin('account', loginParams.value.account)
-  useLoginStore().setlogin('name', loginParams.value.name || '暂未设置姓名')
-  useLoginStore().setlogin('hospital', currentHospital.value)
-  useLoginStore().setlogin('permissions', getPermissions())
-  router.push('/home')
+const loginPost = (data: any) => {
+	Session.set('token', data.access_token);
+	Session.set('refresh_token', data.refresh_token);
+	useLoginStore().setlogin('account', data.username)
+	console.log(data)
+	useLoginStore().setlogin('name', data.user_info.name || '暂未设置姓名')
 }
 
 </script>
 
 <style lang='scss' scoped>
 .login-page {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  background-color: #F8F8F8;
+	width: 100%;
+	height: 100%;
+	display: flex;
+	background-color: #F8F8F8;
 
-  .left-content {
-    width: 50%;
-    height: 100%;
-    background: url(@/assets/imgs/login/login_bck.png) no-repeat;
-    background-size: cover;
-  }
+	.left-content {
+		width: 50%;
+		height: 100%;
+		background: url(@/assets/imgs/login/login_bck.png) no-repeat;
+		background-size: cover;
+	}
 
-  .right-content {
-    position: relative;
-    width: 50%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
+	.right-content {
+		position: relative;
+		width: 50%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 
-    .select-hospital-box {
-      position: absolute;
-      top: 25px;
-      right: 25px;
-    }
+		.select-hospital-box {
+			position: absolute;
+			top: 25px;
+			right: 25px;
+		}
 
-    .logo {
-      height: 70px;
-    }
+		.logo {
+			height: 70px;
+		}
 
-    .login-block {
-      width: 65%;
-      height: 430px;
-      min-width: 500px;
-      min-height: 300px;
-      padding: 50px;
-      margin-top: 20px;
-      background: white;
+		.login-block {
+			width: 65%;
+			height: 430px;
+			min-width: 500px;
+			min-height: 300px;
+			padding: 50px;
+			margin-top: 20px;
+			background: white;
 
-      .login-way {
-        font-size: 18px;
-        color: #909399;
+			.login-way {
+				font-size: 18px;
+				color: #909399;
 
-        span {
-          cursor: pointer;
-          margin-right: 10px;
-        }
+				span {
+					cursor: pointer;
+					margin-right: 10px;
+				}
 
-        .active {
-          color: $main-color;
-          font-weight: 600;
-        }
-      }
+				.active {
+					color: $main-color;
+					font-weight: 600;
+				}
+			}
 
-      .login-form {
-        :deep(.el-input) {
-          font-size: 16px;
-          margin-top: 20px;
+			.login-form {
+				:deep(.el-input) {
+					font-size: 16px;
+					margin-top: 20px;
 
-          .el-input-group__prepend,
-          .el-input__wrapper,
-          .el-input-group__append {
-            box-shadow: none;
-            border-bottom: 1px solid $border-color;
-            background-color: transparent;
-            padding: 10px 20px;
-          }
+					.el-input-group__prepend,
+					.el-input__wrapper,
+					.el-input-group__append {
+						box-shadow: none;
+						border-bottom: 1px solid $border-color;
+						background-color: transparent;
+						padding: 10px 20px;
+					}
 
-          .el-input-group__prepend,
-          .el-input-group__append {
-            position: relative;
+					.el-input-group__prepend,
+					.el-input-group__append {
+						position: relative;
 
-            &::after {
-              content: '';
-              position: absolute;
-              width: 1px;
-              height: 16px;
-              top: calc(50% - 8px);
-              right: 0;
-              background-color: $border-color;
-            }
-          }
+						&::after {
+							content: '';
+							position: absolute;
+							width: 1px;
+							height: 16px;
+							top: calc(50% - 8px);
+							right: 0;
+							background-color: $border-color;
+						}
+					}
 
-          .el-input-group__append::after {
-            right: auto;
-            left: 0;
-          }
-        }
+					.el-input-group__append::after {
+						right: auto;
+						left: 0;
+					}
+				}
 
-        .send-btn {
-          cursor: pointer;
-          color: $main-color;
-          font-weight: 600;
-        }
-      }
+				.send-btn {
+					cursor: pointer;
+					color: $main-color;
+					font-weight: 600;
+				}
+			}
 
-      .login-btn {
-        width: 100%;
-        margin-top: 40px;
-        font-size: 20px;
-        font-weight: 600;
-        padding: 25px 0 25px 0.3em;
-        border-radius: 0px;
-        letter-spacing: 0.3em;
-      }
+			.login-btn {
+				width: 100%;
+				margin-top: 40px;
+				font-size: 20px;
+				font-weight: 600;
+				padding: 25px 0 25px 0.3em;
+				border-radius: 0px;
+				letter-spacing: 0.3em;
+			}
 
-      .register-btn {
-        cursor: pointer;
-        float: right;
-        color: $main-color;
-        margin-top: 20px;
-      }
-    }
+			.register-btn {
+				cursor: pointer;
+				float: right;
+				color: $main-color;
+				margin-top: 20px;
+			}
+		}
 
-    .register-block {
-      width: 65%;
-      min-width: 500px;
-      min-height: 300px;
-      padding: 50px;
-      background: white;
+		.register-block {
+			width: 65%;
+			min-width: 500px;
+			min-height: 300px;
+			padding: 50px;
+			background: white;
 
-      .header-box {
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 30px;
+			.header-box {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 30px;
 
-        .title {
-          font-size: 20px;
-          color: $main-color;
-          font-weight: 600;
-        }
+				.title {
+					font-size: 20px;
+					color: $main-color;
+					font-weight: 600;
+				}
 
-        .el-icon {
-          cursor: pointer;
-        }
-      }
+				.el-icon {
+					cursor: pointer;
+				}
+			}
 
-      .footer-box {
-        padding-left: 100px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+			.footer-box {
+				padding-left: 100px;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 
-        .el-button {
-          font-size: 16px;
-          padding: 5px 50px;
-        }
+				.el-button {
+					font-size: 16px;
+					padding: 5px 50px;
+				}
 
-        & > span {
-          cursor: pointer;
-          font-size: 18px;
-          color: #909399;
-        }
-      }
-    }
-  }
+				& > span {
+					cursor: pointer;
+					font-size: 18px;
+					color: #909399;
+				}
+			}
+		}
+	}
 
 }
 </style>
diff --git a/src/views/remote-manage/chart/chart-ecg.vue b/src/views/remote-manage/chart/chart-ecg.vue
index 8e223d1..9484df1 100644
--- a/src/views/remote-manage/chart/chart-ecg.vue
+++ b/src/views/remote-manage/chart/chart-ecg.vue
@@ -1,197 +1,181 @@
 <template>
-	<div class="chart-dom-box">
-		<div ref="chartDom" style="width: 100%; height: 100%"></div>
-	</div>
+  <div class="chart-dom-box">
+    <div ref="chartDom" style="width: 100%; height: 100%"></div>
+  </div>
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import {onMounted, ref} from 'vue';
 import * as echarts from 'echarts';
-import { dateFormater } from '@/utils/date-util';
+import {dateFormater} from '@/utils/date-util';
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
 const chartDom = ref();
-
-interface Props {
-	names?: string[];
-	chartData: any[];
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	names: () => ['CH1', 'CH2'],
-	chartData: () => [] as any[],
-});
-
-// const emit = defineEmits(['updateData']);
-
-let chart: any;
-const names = props.names; // 类型名称
-const color = ['#00AAB7', '#C77000'];
-let xData = [] as any[]; // x时间轴
-let series = [] as any[];
-
-// 更新图表
-function updateChart(num: number, time?: string) {
-	xData.shift();
-	xData.push(dateFormater('HH:mm:ss', time));
-	// const values = [] as number[];
-	series.forEach((item, index) => {
-		item.data.shift();
-		// item.data.push(index === 0 ? num - 0.2 : index === 2 ? num + 0.2 : num);
-		// item.data.push(index === 0 ? -Math.floor(Math.random() * 50 + 40) : Math.floor(Math.random() * 50 + 40));
-		item.data.push(Math.floor(Math.random() * 160 + -80));
-		// values.push(item.data[item.data.length - 1]);
-	});
-	// emit('updateData', values); // 传值
-	chart.setOption({
-		xAxis: {
-			data: xData,
-		},
-		series,
-	});
-}
-// 格式化数据
-function formatterData() {
-	xData = [];
-	series = [];
-	for (let i = 0; i < 50; i++) {
-		if (props.chartData[i]) xData.push(dateFormater('HH:mm:ss', props.chartData[i].Time || props.chartData[i].TIME));
-		else xData.unshift(0);
-	}
-	names.forEach((item, index) => {
-		const obj = {
-			name: item,
-			type: 'line',
-			symbol: 'none',
-			lineStyle: {
-				color: new echarts.graphic.LinearGradient(0, 0, 1, 1, [
-					{
-						offset: 0,
-						color: 'rgba(40,94,125,0)',
-					},
-					{
-						offset: 0.3,
-						color: color[index],
-					},
-					{
-						offset: 0.5,
-						color: color[index],
-					},
-					{
-						offset: 0.7,
-						color: color[index],
-					},
-					{
-						offset: 1,
-						color: 'rgba(40,94,125,0)',
-					},
-				]),
-				width: 1,
-			},
-			data: [] as number[],
-		};
-		for (let i = 0; i < 50; i++) {
-			if (props.chartData[i]) {
-				const num = props.chartData[i].ST;
-				// obj.data.push(index === 0 ? num - 0.2 : index === 2 ? num + 0.2 : num);
-				// obj.data.push(index === 0 ? -Math.floor(Math.random() * 50 + 40) : Math.floor(Math.random() * 50 + 40));
-				obj.data.push(Math.floor(Math.random() * 160 + -80));
-			} else obj.data.unshift(0);
-		}
-		series.push(obj);
-	});
-}
-// 渲染图表 父组件调用
-function chartSet() {
-	formatterData();
-	if (chart) chart.setOption({
-		xAxis: {
-			data: xData,
-		},
-		series,
-	});
-}
-// 图表初始化
-function chartInit() {
-	chart = echarts.init(chartDom.value as HTMLElement);
-	chart.clear();
-	const option = {
-		color: color,
-		tooltip: {
-			trigger: 'axis',
-			formatter: (params: any) => {
-				let str = params[0].axisValue;
-				str += `<br>`;
-				names.forEach((item, index) => {
-					str += params[index].marker;
-					str += params[index].seriesName + ' ';
-					str += `${params[index].value} HZ`;
-					str += index === 0 ? '<br>' : '';
-				});
-				return str;
-			},
-		},
-		grid: {
-			left: 1,
-			right: 20,
-			bottom: 5,
-			top: 20,
-			containLabel: true,
-		},
-		xAxis: {
-			show: true,
-			type: 'category',
-			boundaryGap: false,
-			axisLine: { show: false, lineStyle: { color: '#006080' } },
-			axisTick: { show: false },
-			axisLabel: { show: false },
-			splitLine: { show: true, lineStyle: { color: '#D4E8F0', width: 1, type: 'solid' } },
-			data: xData,
-		},
-		yAxis: {
-			show: true,
-			type: 'value',
-			min: function (value: any) {
-				return value.min - 40
-			},
-			max: function (value: any) {
-				return value.max + 40
-			},
-			axisLabel: {
-				formatter: `{value} HZ`
-			},
-			axisLine: { show: false, lineStyle: { color: '#006080' } },
-			splitLine: { lineStyle: { color: '#D4E8F0', width: 1, type: 'solid' } },
-		},
-		series,
-	};
-	chart.setOption(option);
-	chart.resize();
-	window.addEventListener('resize', () => {
-		chart.resize();
-	});
-}
-
-onMounted(() => {
-	chartInit();
+const props = withDefaults(defineProps<{ names?: string[] }>(), {
+  names: ['CH1', 'CH2']
 });
 defineExpose({
-	updateChart,
-	chartSet
+  updateChartData
 });
+const emit = defineEmits(["exceptionEvent"]);
+let chart: any;
+const color = ['#00AAB7', '#C77000'];
+const xData = [] as any[]; // x时间轴
+const series = [] as any[];
+let currentNode: any;
+const remoteWsStore = useRemoteWsStore();
+
+onMounted(() => {
+  chartInit();
+});
+
+function updateChartData(data: any) {
+  if (data) {
+    if (currentNode && currentNode.Time == data.Time) {
+      return;
+    } else {
+      currentNode = data;
+    }
+    xData.shift();
+    xData.push(dateFormater("HH:mm:ss", data.Time ? data.Time - 8 * 60 * 60 * 1000 : ""));
+    series.forEach(serie => {
+      serie.data.shift();
+      serie.data.push(data[serie] ? data[serie] : 0);
+      if (data[serie.name + '_except']) {
+        emit("exceptionEvent", remoteWsStore.exceptionMsg[serie.name + '_except']);
+      }
+    })
+    chart.setOption({
+      xAxis: {
+        data: xData,
+      },
+      series
+    });
+  }
+}
+
+// 图表初始化
+function chartInit() {
+  chart = echarts.init(chartDom.value as HTMLElement);
+  chart.clear();
+  getXData();
+  getSeries();
+  const option = {
+    color: color,
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params: any) => {
+        let str = params[0].axisValue;
+        str += `<br>`;
+        props.names.forEach((item, index) => {
+          str += params[index].marker;
+          str += params[index].seriesName + ' ';
+          str += `${params[index].value} HZ`;
+          str += index === 0 ? '<br>' : '';
+        });
+        return str;
+      },
+    },
+    grid: {
+      left: 1,
+      right: 20,
+      bottom: 5,
+      top: 20,
+      containLabel: true,
+    },
+    xAxis: {
+      show: true,
+      type: 'category',
+      boundaryGap: false,
+      axisLine: {show: false, lineStyle: {color: '#006080'}},
+      axisTick: {show: false},
+      axisLabel: {show: false},
+      splitLine: {show: true, lineStyle: {color: '#D4E8F0', width: 1, type: 'solid'}},
+      data: xData,
+    },
+    yAxis: {
+      show: true,
+      type: 'value',
+      min: function (value: any) {
+        return value.min - 40
+      },
+      max: function (value: any) {
+        return value.max + 40
+      },
+      axisLabel: {
+        formatter: `{value} HZ`
+      },
+      axisLine: {show: false, lineStyle: {color: '#006080'}},
+      splitLine: {lineStyle: {color: '#D4E8F0', width: 1, type: 'solid'}},
+    },
+    series,
+  };
+  chart.setOption(option);
+  chart.resize();
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+}
+
+function getXData() {
+  for (let i = 0; i < 50; i++) {
+    xData.push(0);
+  }
+}
+
+function getSeries() {
+  props.names.forEach((name, index) => {
+    const serie = {
+      name,
+      type: 'line',
+      symbol: 'none',
+      lineStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 1, 1, [
+          {
+            offset: 0,
+            color: 'rgba(40,94,125,0)',
+          },
+          {
+            offset: 0.3,
+            color: color[index],
+          },
+          {
+            offset: 0.5,
+            color: color[index],
+          },
+          {
+            offset: 0.7,
+            color: color[index],
+          },
+          {
+            offset: 1,
+            color: 'rgba(40,94,125,0)',
+          },
+        ]),
+        width: 1,
+      },
+      data: [],
+    };
+    for (let i = 0; i < 50; i++) {
+      serie.data.push(0);
+    }
+    series.push(serie);
+  });
+}
 </script>
 
 <style lang="scss" scoped>
 .chart-dom-box {
-	position: relative;
+  position: relative;
 
-	.chart-rate {
-		position: absolute;
-		top: 5px;
-		left: 30px;
-		color: #285e7d;
-		font-size: 16px;
-		line-height: 30px;
-		font-weight: 600;
-	}
+  .chart-rate {
+    position: absolute;
+    top: 5px;
+    left: 30px;
+    color: #285e7d;
+    font-size: 16px;
+    line-height: 30px;
+    font-weight: 600;
+  }
 }
 </style>
diff --git a/src/views/remote-manage/chart/chart-line.vue b/src/views/remote-manage/chart/chart-line.vue
index 5b829bf..a875cda 100644
--- a/src/views/remote-manage/chart/chart-line.vue
+++ b/src/views/remote-manage/chart/chart-line.vue
@@ -5,102 +5,73 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import {onMounted, ref} from 'vue';
 import * as echarts from 'echarts';
-import { dateFormater } from '@/utils/date-util';
+import {dateFormater} from '@/utils/date-util';
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
 const chartDom = ref();
+const props = withDefaults(defineProps<{
+	names: string[]
+}>(), {
+	names: ['BIS', 'HR']
+});
+defineExpose({
+	updateChartData
+});
+const emit = defineEmits(["exceptionEvent"]);
+let chart: any;
+const xData: any = [];
+const series: any = [];
+const legendData: any = [];
+const colors = ['#00AAB7', '#C77000'];
+let currentNode: any;
+const remoteWsStore = useRemoteWsStore();
 
-interface Props {
-	names: string[];
-	chartData: any[];
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	names: () => ['BIS', 'HR'],
-	chartData: () => [] as any[],
+onMounted(() => {
+	chartInit();
 });
 
-// const emit = defineEmits(['updateData']);
-
-let chart: any;
-const names = props.names; // 类型名称
-const color = ['#00AAB7', '#C77000'];
-let legendData = [] as any[];
-let xData = [] as any[]; // x时间轴
-let series = [] as any[];
-
-
-// 更新图表
-function updateChart(ary: number[], time?: string) {
-	xData.shift();
-	xData.push(dateFormater('HH:mm:ss', time));
-	// const values: number[] = [];
-	series.forEach((item, index) => {
-		item.data.shift();
-		item.data.push(ary[index]);
-		// values.push(item.data[item.data.length - 1]);
-	});
-	// emit('updateData', [values]); // 传值
-	chart.setOption({
-		xAxis: {
-			data: xData,
-		},
-		series,
-	});
+function updateChartData(data: any) {
+  if (data) {
+    if (currentNode && currentNode.Time == data.Time) {
+      return;
+    } else {
+      currentNode = data;
+    }
+    xData.shift();
+    xData.push(dateFormater("HH:mm:ss", data.Time ? data.Time - 8 * 60 * 60 * 1000 : ''));
+    series.forEach(serie => {
+      serie.data.shift();
+      serie.data.push(data[serie.name]);
+      if (data[serie.name + '_except']) {
+        emit("exceptionEvent", remoteWsStore.exceptionMsg[serie.name + '_except']);
+      }
+    })
+    chart.setOption({
+      xAxis: {
+        data: xData,
+      },
+      series,
+    })
+  }
 }
-// 格式化数据
-function formatterData() {
-	legendData = [];
-	xData = [];
-	series = [];
-	for (let i = 0; i < 10; i++) {
-		if (props.chartData[i]) xData.push(dateFormater('HH:mm:ss', props.chartData[i].Time || props.chartData[i].TIME));
-		else xData.unshift(0);
-	}
-	names.forEach((item, index) => {
-		const obj = {
-			name: item,
-			type: 'line',
-			symbol: 'none',
-			smooth: true,
-			data: [] as number[],
-		};
-		for (let i = 0; i < 10; i++) {
-			if (props.chartData[i]) obj.data.push(props.chartData[i][item]);
-			else obj.data.unshift(0);
-		}
-		legendData.push({
-			name: item,
-			textStyle: { color: color[index] },
-		});
-		series.push(obj);
-	});
-}
-// 渲染图表 父组件调用
-function chartSet() {
-	formatterData();
-	if (chart) chart.setOption({
-		xAxis: {
-			data: xData,
-		},
-		series,
-	});
-}
-// 图表初始化
+
 function chartInit() {
 	chart = echarts.init(chartDom.value as HTMLElement);
 	chart.clear();
-	formatterData();
-	const option : any = {
-		color,
+	getSeries();
+	getXData();
+	getLegendData();
+	const option: any = {
+		color: colors,
 		tooltip: {
 			trigger: 'axis',
 			formatter: (params: any) => {
 				let str = '';
 				str += params[0].axisValue;
 				str += '<br>';
-				names.forEach((item, index) => {
+				props.names.forEach((item, index) => {
 					str += params[index].marker;
 					str += params[index].seriesName + ' ';
 					switch (item) {
@@ -145,7 +116,7 @@ function chartInit() {
 				lineHeight: 30,
 			},
 			formatter: (params: string) => {
-				const index = names.findIndex((item) => item === params);
+				const index = props.names.findIndex((item) => item === params);
 				let str = params + ' ';
 				switch (params) {
 					case 'BIS':
@@ -171,7 +142,7 @@ function chartInit() {
 				}
 				return str;
 			},
-			data: legendData,
+			data: legendData
 		},
 		grid: {
 			left: 5,
@@ -184,21 +155,22 @@ function chartInit() {
 			show: true,
 			type: 'category',
 			boundaryGap: false,
-			data: xData,
-			axisLine: { lineStyle: { color: '#006080' } }
+			data: [],
+			axisLine: {lineStyle: {color: '#006080'}}
 		},
 		yAxis: {
 			show: true,
 			type: 'value',
 			axisLabel: {
-				formatter: `{value} ${names[0] === 'BIS' ? '次/分' : names[0] === 'SBP' ? 'mmHg' : ''}`
+				formatter: `{value} ${props.names[0] === 'BIS' ? '次/分' : props.names[0] === 'SBP' ? 'mmHg' : ''}`
 			},
-			axisLine: { show: true, lineStyle: { color: '#006080' } },
-			splitLine: { lineStyle: { color: '#C0C4CC', width: 1, type: 'dashed' } },
+			axisLine: {show: true, lineStyle: {color: '#006080'}},
+			splitLine: {lineStyle: {color: '#C0C4CC', width: 1, type: 'dashed'}},
 		},
 		series,
 	};
-	if(names[0] !== 'BIS') {
+	if (props.names[0] !== 'BIS'
+	) {
 		option.yAxis.max = (value: any) => value.max + 20;
 	}
 	chart.setOption(option);
@@ -208,13 +180,36 @@ function chartInit() {
 	});
 }
 
-onMounted(() => {
-	chartInit();
-});
-defineExpose({
-	updateChart,
-	chartSet
-});
+function getSeries() {
+	props.names.forEach(name => {
+		const serie = {
+			name,
+			type: 'line',
+			symbol: 'none',
+			smooth: true,
+			data: [] as number[],
+		};
+		for (let i = 0; i < 10; i++) {
+			serie.data.push(0);
+		}
+		series.push(serie)
+	});
+}
+
+function getXData() {
+	for (let i = 0; i < 10; i++) {
+		xData.push(0);
+	}
+}
+
+function getLegendData() {
+	props.names.forEach((name, index) => {
+		legendData.push({
+			name,
+			textStyle: {color: colors[index]},
+		});
+	});
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/remote-manage/part/message-item-part.vue b/src/views/remote-manage/part/message-item-part.vue
index 1061694..3de0b4e 100644
--- a/src/views/remote-manage/part/message-item-part.vue
+++ b/src/views/remote-manage/part/message-item-part.vue
@@ -1,51 +1,41 @@
 <template>
-  <div class="message-item-part">
-    <div class="tag-index">{{ index + 1 }}</div>
-    <ul ref="listRef">
-      <li v-for="(item, index) in logs" :key="index">
-        <span>{{ dateFormater('HH:mm:ss', item.time) }}</span>
-        <span>{{ item.title }}</span>
-        <span>{{ item.state }}</span>
-      </li>
-    </ul>
-  </div>
+	<div class="message-item-part">
+		<div class="tag-index">{{ index + 1 }}</div>
+		<ul ref="listRef">
+			<li v-for="(item, i) in remoteWsStore.remoteTasks[index]?.log || []" :key="i">
+				<span>{{ dateFormater('yyyy-MM-dd HH:mm:ss', item.time) }}</span>
+				<span>{{ item.taskName }}</span>
+				<span>{{ item.state }}</span>
+			</li>
+		</ul>
+	</div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import type { RemoteLogItem, RemoteItem } from '@/utils/public-interface'
-import { useRemoteStore } from '@/stores/remote-info-store'
-import { dateFormater } from '@/utils/date-util'
-
-interface Props {
-  index: number
-  logs: Array<RemoteLogItem>
-}
-const props = withDefaults(defineProps<Props>(), {
-  index: () => 0,
-  logs: () => [] as Array<RemoteLogItem>
-})
+import {ref} from 'vue';
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
+import {dateFormater} from "@/utils/date-util";
 
+const remoteWsStore = useRemoteWsStore();
+const props = withDefaults(defineProps<{
+		index: number
+	}>(),
+	{
+		index: () => 0
+	})
 const listRef = ref()
-const remoteTasks: any = ref([] as Array<RemoteItem>)
 
 defineExpose({
-  scrollToBottom,
+	scrollToBottom
 })
 
-remoteTasks.value = useRemoteStore().remoteTasks
-// 监听 useRemoteStore() 值变化
-// useRemoteStore().$subscribe((mutation: any, state: any) => {
-//   console.log(mutation, state)
-// })
-
 function scrollToBottom() {
-  setTimeout(() => {
-    listRef.value.scrollTo({
-      top: listRef.value.scrollHeight,
-      behavior: 'smooth'
-    })
-  }, 0)
+	setTimeout(() => {
+		listRef.value.scrollTo({
+			top: listRef.value.scrollHeight,
+			behavior: 'smooth'
+		})
+	}, 0)
 }
 </script>
 
diff --git a/src/views/remote-manage/part/message-part.vue b/src/views/remote-manage/part/message-part.vue
index 9b18d71..4bbb628 100644
--- a/src/views/remote-manage/part/message-part.vue
+++ b/src/views/remote-manage/part/message-part.vue
@@ -1,47 +1,45 @@
 <template>
-  <div class="message-part">
-    <div class="title">
-      <span>消息通知</span>
-    </div>
-    <div ref="listRef" class="content">
-      <el-timeline>
-        <el-timeline-item v-for="(item, index) in remoteStore.currentRemote.log || []" :key="index"
-          :timestamp="dateFormater('yyyy-MM-dd HH:mm:ss', item.time)"
-          :class="{ 'alarm': item.state === '连接失败' || item.state === '异常' }">
-          {{ item.title + ' ' + item.state }}
-        </el-timeline-item>
-      </el-timeline>
-    </div>
-  </div>
+	<div class="message-part">
+		<div class="title">
+			<span>消息通知</span>
+		</div>
+		<div ref="listRef" class="content">
+			<el-timeline>
+				<el-timeline-item v-for="(item, index) in remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]?.log || []" :key="index"
+													:timestamp="dateFormater('yyyy-MM-dd HH:mm:ss', item.time)"
+													:class="{ 'alarm': item.state === '连接失败' || item.state === '异常' }">
+					{{ item.taskName + ' ' + item.state }}
+				</el-timeline-item>
+			</el-timeline>
+		</div>
+	</div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import type { RemoteLogItem, RemoteItem } from '@/utils/public-interface'
-import { useRemoteStore } from '@/stores/remote-info-store'
-import { dateFormater } from '@/utils/date-util'
+import {ref} from 'vue'
+import {dateFormater} from '@/utils/date-util'
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
 
 defineExpose({
-  setData,
-  scrollToBottom
+	setData,
+	scrollToBottom
 })
 
-const remoteStore = useRemoteStore()
+const remoteWsStore = useRemoteWsStore()
 const listRef = ref()
 
-function setData(e: RemoteLogItem, index: number) {
-  remoteStore.setRemoteLog(e, index)
-  remoteStore.$patch({currentRemote: remoteStore.remoteTasks[index]})
+function setData(e: any, index: number) {
+	remoteWsStore.setRemoteLog(e, index)
 }
 
 function scrollToBottom() {
-  setTimeout(() => {
-    listRef.value.scrollTo({
-      top: listRef.value.scrollHeight,
-      behavior: 'smooth'
-    })
-  }, 0)
+	setTimeout(() => {
+		listRef.value.scrollTo({
+			top: listRef.value.scrollHeight,
+			behavior: 'smooth'
+		})
+	}, 0)
 }
 </script>
 
diff --git a/src/views/remote-manage/part/remote-dialog.vue b/src/views/remote-manage/part/remote-dialog.vue
index dd60c7c..3082d64 100644
--- a/src/views/remote-manage/part/remote-dialog.vue
+++ b/src/views/remote-manage/part/remote-dialog.vue
@@ -1,72 +1,101 @@
 <template>
-    <el-dialog class="header-none" v-model="dialogVisible" :width="700" :show-close="false">
-        <div class="content-box">
-            <img src="@/assets/imgs/remote/remote_bck.png">
-            <div class="info">
-                <h3>连接云服务器</h3>
-                <br>
-                <p>云服务器连接状态：{{ patientInfo.isRemote ? '已连接' : '未连接' }}</p>
-                <p>输入用户名：{{ patientInfo.serverUser }}</p>
-                <p>密码：*********</p>
-                <br>
-                <p class="input-box"><span>输入病人姓名：</span><el-input v-model="patientInfo.patientName"></el-input></p>
-                <p class="input-box"><span>输入病人身份证号：</span><el-input v-model="patientInfo.patientCode"></el-input></p>
-            </div>
-        </div>
-        <div class="btn-box">
-            <el-button class="f18" type="primary" @click="confirmRemote">确定连接</el-button>
-            <!-- <el-button class="f18" @click="breakRemote">断开连接</el-button> -->
-            <el-button class="f18" style="margin-left: 50px;" @click="dialogVisible = false">返回</el-button>
-        </div>
-    </el-dialog>
+  <el-dialog class="header-none" v-model="dialogVisible" :width="700" :show-close="false">
+    <div class="content-box">
+      <img src="@/assets/imgs/remote/remote_bck.png">
+      <div class="info">
+        <h3>连接云服务器</h3>
+        <br>
+        <!-- <p>云服务器连接状态：{{ patientInfo.isRemote ? '已连接' : '未连接' }}</p>
+        <p>输入用户名：{{ patientInfo.serverun }}</p>
+        <p>密码：*********</p>
+        <br>-->
+        <p class="input-box"><span>输入病人姓名：</span>
+          <el-input v-model="patientInfo.patient"></el-input>
+        </p>
+        <p class="input-box"><span>输入病人身份证号：</span>
+          <el-input v-model="patientInfo.patientId"></el-input>
+        </p>
+        <p class="input-box"><span>请选择手术时间：</span>
+          <el-date-picker
+            v-model="patientInfo.date"
+            type="date"
+            placeholder="请选择日期"
+          />
+        </p>
+      </div>
+    </div>
+    <div class="btn-box">
+      <el-button class="f18" type="primary" @click="confirmRemote">确定连接</el-button>
+      <!-- <el-button class="f18" @click="breakRemote">断开连接</el-button> -->
+      <el-button class="f18" style="margin-left: 50px;" @click="dialogVisible = false">返回</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import { useRemoteStore } from '@/stores/remote-info-store';
-import type { RemoteItem } from '@/utils/public-interface';
-
-const router = useRouter()
+import {ref} from 'vue'
+import {ElMessage} from 'element-plus'
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
+import {dateFormater} from "@/utils/date-util";
 
 const emit = defineEmits(['confirmRemote', 'errorRemote', 'breakRemote'])
 
 const dialogVisible = ref(false)
-const patientInfo = ref({} as RemoteItem)
+const patientInfo = ref({} as any)
+const remoteWsStore = useRemoteWsStore();
 
 defineExpose({
-    open,
-    close,
-})
-onMounted(() => {
-
+  open,
+  close,
 })
 
-function open(e: RemoteItem) {
-    patientInfo.value = JSON.parse(JSON.stringify(e))
-    dialogVisible.value = true
+function open(e: number) {
+  patientInfo.value = remoteWsStore.remoteTasks[e]
+  dialogVisible.value = true
 }
+
 function close() {
-    dialogVisible.value = false
+  dialogVisible.value = false
 }
 
 const confirmRemote = () => {
-    if(patientInfo.value.patientCode) {
-        ElMessage.success('连接成功！')
-        patientInfo.value.isRemote = true
-        patientInfo.value.title = '远程控制' + (patientInfo.value.index + 1)
-        emit('confirmRemote', patientInfo.value)
-        close()
-    }else{
-        ElMessage.error('连接失败！')
-        emit('errorRemote', patientInfo.value)
-    }
+  if (patientInfo.value.patientId && patientInfo.value.patient) {
+    ElMessage.success('连接成功！')
+    patientInfo.value.isRemote = true
+    patientInfo.value.taskName = '远程控制' + (patientInfo.value.index + 1)
+    patientInfo.value.date = dateFormater("yyyy-MM-dd", patientInfo.value.date)
+    unsubscribeLastTask();
+    remoteWsStore.$patch({currentTaskIndex: patientInfo.value.index})
+    remoteWsStore.setRemoteLog({
+      time: new Date(),
+      taskName: patientInfo.value.taskName,
+      state: '连接成功',
+      type: "normal"
+    }, remoteWsStore.currentTaskIndex)
+    emit('confirmRemote', patientInfo.value)
+    close()
+  } else {
+    remoteWsStore.setRemoteLog({
+      time: new Date(),
+      taskName: patientInfo.value.taskName,
+      state: '连接失败'
+    }, patientInfo.value.index)
+    ElMessage.error('连接失败！')
+    emit('errorRemote', patientInfo.value)
+  }
 }
 const breakRemote = () => {
-    ElMessage.info('连接已断开！')
-    emit('breakRemote', patientInfo.value)
-    close()
+  ElMessage.info('连接已断开！')
+  emit('breakRemote', patientInfo.value)
+  close()
+}
+
+const unsubscribeLastTask = () => {
+  const lastTaskIndex = remoteWsStore.currentTaskIndex;
+  const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
+  if (lastTask) {
+    remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
+  }
 }
 
 </script>
@@ -115,6 +144,7 @@ const breakRemote = () => {
         }
     }
 }
+
 .btn-box {
     display: flex;
     justify-content: center;
diff --git a/src/views/remote-manage/part/remote-item-part.vue b/src/views/remote-manage/part/remote-item-part.vue
index f7ad3b2..e3b4785 100644
--- a/src/views/remote-manage/part/remote-item-part.vue
+++ b/src/views/remote-manage/part/remote-item-part.vue
@@ -1,122 +1,114 @@
 <template>
-  <div class="remote-item-part">
-    <div class="title">
-      <span>{{ remoteTask.title || '远程控制' }}</span>
-    </div>
-    <div class="content mini" :class="{ 'is-total': remoteTask.isRemote }">
-      <div class="left-box">
-        <div class="info-box">
-          <div class="row-item">
-            <span class="label">病人名称</span>
-            <span class="input-value">{{ patientInfo.name }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">住院号</span>
-            <span class="input-value">{{ patientInfo.code }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">手术时间</span>
-            <span class="input-value">{{ patientInfo.time && dateFormater('yyyy-MM-dd HH:mm:ss', patientInfo.time)
-            }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">手术状态</span>
-            <span class="tag-value" :class="{ 'normal': !patientInfo.state }">正常</span>
-            <span class="tag-value" :class="{ 'alarm': patientInfo.state }">异常</span>
-          </div>
-        </div>
-        <div class="row-item" :class="{ 'alarm': patientInfo.BIS < 40 || patientInfo.BIS > 60 }">
-          <span class="label">BIS</span>
-          <span class="value">{{ patientInfo.BIS }}</span>
-        </div>
-        <div class="row-item" :class="{ 'alarm': patientInfo.SBP < 90 || patientInfo.SBP > 120 }">
-          <span class="label">SBP</span>
-          <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item">
-          <span class="label">SPO2</span>
-          <span class="value">{{ patientInfo.SPO2 }}</span>
-        </div>
-        <div class="row-item yellow" :class="{ 'alarm': patientInfo.DBP < 60 || patientInfo.DBP > 90 }">
-          <span class="label">DBP</span>
-          <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item yellow" :class="{ 'alarm': patientInfo.HR < 50 || patientInfo.HR > 80 }">
-          <span class="label">HR</span>
-          <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
-        </div>
-        <div class="row-item yellow">
-          <span class="label">TEMP</span>
-          <span class="value">{{ patientInfo.TEMP }}</span>
-        </div>
-      </div>
-      <div class="center-box">
-        <img src="@/assets/imgs/main_body_intact.png">
-      </div>
-    </div>
-  </div>
+	<div class="remote-item-part">
+		<div class="title">
+			<span>{{ remoteTask.taskName || '远程控制' }}</span>
+		</div>
+		<div class="content mini" :class="{ 'is-total': remoteTask.isRemote }">
+			<div class="left-box">
+				<div class="info-box">
+					<div class="row-item">
+						<span class="label">病人名称</span>
+						<span class="input-value">{{ remoteTask.patient }}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">住院号</span>
+						<span class="input-value">{{ remoteTask.patientId }}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">手术时间</span>
+						<span class="input-value">{{
+								remoteTask.date
+							}}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">手术状态</span>
+						<span class="tag-value" :class="{ 'normal': !patientInfo.state }">正常</span>
+						<span class="tag-value" :class="{ 'alarm': patientInfo.state }">异常</span>
+					</div>
+				</div>
+				<div class="row-item" :class="{ 'alarm': patientInfo.BIS_except }">
+					<span class="label">BIS</span>
+					<span class="value">{{ patientInfo.BIS }}</span>
+				</div>
+				<div class="row-item" :class="{ 'alarm': patientInfo.SBP_except }">
+					<span class="label">SBP</span>
+					<span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item">
+					<span class="label">SPO2</span>
+					<span class="value">{{ patientInfo.SPO2 }}</span>
+				</div>
+				<div class="row-item yellow" :class="{ 'alarm': patientInfo.DBP_except }">
+					<span class="label">DBP</span>
+					<span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item yellow" :class="{ 'alarm': patientInfo.HR_except }">
+					<span class="label">HR</span>
+					<span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
+				</div>
+				<div class="row-item yellow">
+					<span class="label">TEMP</span>
+					<span class="value">{{ patientInfo.TEMP }}</span>
+				</div>
+			</div>
+			<div class="center-box">
+				<img src="@/assets/imgs/main_body_intact.png">
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, onBeforeUnmount, reactive, ref, toRefs, watch } from 'vue'
-import type { RemoteItem, PatientInfoItem, RemoteLogItem } from '@/utils/public-interface'
-import { useRemoteStore } from '@/stores/remote-info-store'
-import { dateFormater } from '@/utils/date-util'
-import { setRemoteLog } from '@/static-data/core'
+import {onMounted, onUnmounted, ref} from 'vue'
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
-interface Props {
-  index: number
-}
-const props = withDefaults(defineProps<Props>(), {
-  index: () => 0
+const props = withDefaults(defineProps<{ index: number }>(), {
+	index: () => 0
 })
-
 const emit = defineEmits(['addLogAfter'])
-
-const remoteStore = useRemoteStore()
-const remoteTask = remoteStore.remoteTasks[props.index]
-let timer = 0
-const patientInfo = ref({} as PatientInfoItem)
+const remoteWsStore = useRemoteWsStore();
+const remoteTask = ref(remoteWsStore.remoteTasks[props.index]);
+const patientInfo = ref({} as any)
 
 onMounted(() => {
-  clearInterval(timer)
-  // 连接成功执行查询
-  if (remoteTask.isRemote) {
-    timer = setInterval(() => {
-      initData()
-    }, 2000)
-  }
+	// 连接成功执行查询
+	if (remoteTask.value.isRemote) {
+		initData()
+	}
 })
-onBeforeUnmount(() => {
-  // 页面卸载后清楚定时器
-  clearInterval(timer)
+onUnmounted(() => {
+	remoteWsStore.unsubscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date);
 })
 
 function initData() {
-  remoteTask.dataAlarm = false
-  const obj = {
-    name: remoteTask.patientName,
-    code: '',
-    time: new Date(),
-    state: false,
-    BIS: Number((Math.random() * 100).toFixed(2)),
-    SBP: Number((Math.random() * 100).toFixed(2)),
-    SPO2: Number((Math.random() * 100).toFixed(2)),
-    DBP: Number((Math.random() * 100).toFixed(2)),
-    HR: Number((Math.random() * 100).toFixed(2)),
-    TEMP: Number((Math.random() * 100).toFixed(2))
-  }
-  setRemoteLog(obj, (title: string, size: string) => {
-    obj.state = true
-    remoteTask.dataAlarm = true
-    remoteStore.setRemoteLog({
-      time: new Date(),
-      title,
-      state: '异常'
-    }, props.index)
+	subscribeVital();
+}
+
+function subscribeVital() {
+	remoteWsStore.subscribeVital(remoteTask.value.patient, remoteTask.value.patientId, remoteTask.value.date, (res: any) => {
+		const data = JSON.parse(res.data);
+		if (data.vitalSignsList && data.vitalSignsList.length > 0) {
+			Object.assign(patientInfo.value, data.vitalSignsList[0]);
+			patientInfo.value.state = (patientInfo.value.BIS_except || patientInfo.value.SBP_except ||
+				patientInfo.value.DBP_except || patientInfo.value.HR_except);
+      setLog(patientInfo.value, props.index)
+      emit('addLogAfter', props.index)
+		}
+	})
+}
+
+function setLog(data: any, index: number) {
+  remoteWsStore.exceptionType.forEach((item: any) => {
+    if (data[item]) {
+      const msg: any = remoteWsStore.exceptionMsg[item];
+      remoteWsStore.setRemoteLog({
+        state: msg,
+        taskName: remoteTask.value.taskName,
+        time: new Date(),
+        type: "exception"
+      }, index);
+    }
   })
-  Object.assign(patientInfo.value, obj)
-  emit('addLogAfter', props.index)
 }
 
 </script>
diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue
index 0618af3..014e5d0 100644
--- a/src/views/remote-manage/part/remote-part.vue
+++ b/src/views/remote-manage/part/remote-part.vue
@@ -1,190 +1,195 @@
 <template>
-    <div class="remote-part">
-        <div class="title">
-            <span>{{ remoteItem?.title || '远程控制' }}</span>
-            <el-button v-if="remoteItem" class="break-btn" @click="breakRemote">断开连接</el-button>
-        </div>
-        <!-- 小分辨率 -->
-        <div v-if="mediaMini800" class="content mini" :class="{'is-total': remoteItem?.isRemote}">
-            <div class="left-box">
-                <div class="info-box">
-                    <div class="row-item">
-                        <span class="label">病人名称</span>
-                        <span class="input-value">{{ patientInfo.name }}</span>
-                    </div>
-                    <div class="row-item">
-                        <span class="label">住院号</span>
-                        <span class="input-value">{{ patientInfo.code }}</span>
-                    </div>
-                    <div class="row-item">
-                        <span class="label">手术时间</span>
-                        <span class="input-value">{{ patientInfo.time && dateFormater('yyyy-MM-dd HH:mm:ss', patientInfo.time) }}</span>
-                    </div>
-                    <div class="row-item">
-                        <span class="label">手术状态</span>
-                        <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
-                        <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
-                    </div>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.BIS < 40 || patientInfo.BIS > 60}">
-                    <span class="label">BIS</span>
-                    <span class="value">{{ patientInfo.BIS }}</span>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.SBP < 90 || patientInfo.SBP > 120}">
-                    <span class="label">SBP</span>
-                    <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
-                </div>
-                <div class="row-item">
-                    <span class="label">SPO2</span>
-                    <span class="value">{{ patientInfo.SPO2 }}</span>
-                </div>
-                <div class="row-item yellow" :class="{'alarm': patientInfo.DBP < 60 || patientInfo.DBP > 90}">
-                    <span class="label">DBP</span>
-                    <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
-                </div>
-                <div class="row-item yellow" :class="{'alarm': patientInfo.HR < 50 || patientInfo.HR > 80}">
-                    <span class="label">HR</span>
-                    <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
-                </div>
-                <div class="row-item yellow">
-                    <span class="label">TEMP</span> 
-                    <span class="value">{{ patientInfo.TEMP }}</span>
-                </div>
-            </div>
-            <div class="center-box">
-                <img src="@/assets/imgs/main_body_intact.png">
-            </div>
-        </div>
-        <div v-else class="content" :class="{'is-total': remoteItem?.isRemote}">
-            <div class="left-box">
-                <div class="info-box">
-                    <div class="row-item">
-                        <span class="label">病人名称</span>
-                        <span class="input-value">{{ patientInfo.name }}</span>
-                    </div>
-                    <div class="row-item">
-                        <span class="label">住院号</span>
-                        <span class="input-value">{{ patientInfo.code }}</span>
-                    </div>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.BIS < 40 || patientInfo.BIS > 60}">
-                    <span class="label">BIS</span>
-                    <span class="value">{{ patientInfo.BIS }}</span>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.SBP < 90 || patientInfo.SBP > 120}">
-                    <span class="label">SBP</span>
-                    <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
-                </div>
-                <div class="row-item">
-                    <span class="label">SPO2</span>
-                    <span class="value">{{ patientInfo.SPO2 }}</span>
-                </div>
-            </div>
-            <div class="center-box">
-                <img src="@/assets/imgs/main_body_intact.png">
-            </div>
-            <div class="right-box">
-                <div class="info-box">
-                    <div class="row-item">
-                        <span class="label">手术时间</span>
-                        <span class="input-value">{{ patientInfo.time && dateFormater('yyyy-MM-dd HH:mm:ss', patientInfo.time) }}</span>
-                    </div>
-                    <div class="row-item">
-                        <span class="label">手术状态</span>
-                        <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
-                        <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
-                    </div>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.DBP < 60 || patientInfo.DBP > 90}">
-                    <span class="label">DBP</span>
-                    <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
-                </div>
-                <div class="row-item" :class="{'alarm': patientInfo.HR < 50 || patientInfo.HR > 80}">
-                    <span class="label">HR</span>
-                    <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
-                </div>
-                <div class="row-item">
-                    <span class="label">TEMP</span> 
-                    <span class="value">{{ patientInfo.TEMP }}</span>
-                </div>
-            </div>
-        </div>
+  <div class="remote-part">
+    <div class="title">
+      <span>{{ remoteItem?.taskName || '远程控制' }}</span>
+      <el-button v-if="remoteItem?.taskName" class="break-btn" @click="breakRemote">断开连接</el-button>
     </div>
+    <!-- 小分辨率 -->
+    <div v-if="mediaMini800" class="content mini" :class="{'is-total': remoteItem?.isRemote}">
+      <div class="left-box">
+        <div class="info-box">
+          <div class="row-item">
+            <span class="label">病人名称</span>
+            <span class="input-value">{{ remoteItem.patient }}</span>
+          </div>
+          <div class="row-item">
+            <span class="label">住院号</span>
+            <span class="input-value">{{ remoteItem.patientId }}</span>
+          </div>
+          <div class="row-item">
+            <span class="label">手术时间</span>
+            <span class="input-value">{{
+                remoteItem.date
+              }}</span>
+          </div>
+          <div class="row-item">
+            <span class="label">手术状态</span>
+            <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
+            <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
+          </div>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
+          <span class="label">BIS</span>
+          <span class="value">{{ patientInfo.BIS }}</span>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
+          <span class="label">SBP</span>
+          <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
+        </div>
+        <div class="row-item">
+          <span class="label">SPO2</span>
+          <span class="value">{{ patientInfo.SPO2 }}</span>
+        </div>
+        <div class="row-item yellow" :class="{'alarm': patientInfo.DBP_except}">
+          <span class="label">DBP</span>
+          <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
+        </div>
+        <div class="row-item yellow" :class="{'alarm': patientInfo.HR_except}">
+          <span class="label">HR</span>
+          <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
+        </div>
+        <div class="row-item yellow">
+          <span class="label">TEMP</span>
+          <span class="value">{{ patientInfo.TEMP }}</span>
+        </div>
+      </div>
+      <div class="center-box">
+        <img src="@/assets/imgs/main_body_intact.png">
+      </div>
+    </div>
+    <div v-else class="content" :class="{'is-total': remoteItem?.isRemote}">
+      <div class="left-box">
+        <div class="info-box">
+          <div class="row-item">
+            <span class="label">病人名称</span>
+            <span class="input-value">{{ remoteItem.patient }}</span>
+          </div>
+          <div class="row-item">
+            <span class="label">住院号</span>
+            <span class="input-value">{{ remoteItem.patientId }}</span>
+          </div>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
+          <span class="label">BIS</span>
+          <span class="value">{{ patientInfo.BIS }}</span>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
+          <span class="label">SBP</span>
+          <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
+        </div>
+        <div class="row-item">
+          <span class="label">SPO2</span>
+          <span class="value">{{ patientInfo.SPO2 }}</span>
+        </div>
+      </div>
+      <div class="center-box">
+        <img src="@/assets/imgs/main_body_intact.png">
+      </div>
+      <div class="right-box">
+        <div class="info-box">
+          <div class="row-item">
+            <span class="label">手术时间</span>
+            <span class="input-value">{{
+                remoteItem.date
+              }}</span>
+          </div>
+          <div class="row-item">
+            <span class="label">手术状态</span>
+            <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
+            <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
+          </div>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.DBP_except}">
+          <span class="label">DBP</span>
+          <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
+        </div>
+        <div class="row-item" :class="{'alarm': patientInfo.HR_except}">
+          <span class="label">HR</span>
+          <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
+        </div>
+        <div class="row-item">
+          <span class="label">TEMP</span>
+          <span class="value">{{ patientInfo.TEMP }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, onBeforeUnmount, reactive, ref, toRefs, watch } from 'vue'
-import { dateFormater } from '@/utils/date-util'
-import { useRemoteStore } from '@/stores/remote-info-store';
-import type { RemoteItem, PatientInfoItem } from '@/utils/public-interface'
-import { setRemoteLog } from '@/static-data/core'
+import {onUnmounted, ref} from 'vue'
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
 const emit = defineEmits(['addLogAfter', 'breakRemote'])
-
-const remoteStore = useRemoteStore()
-let timer = 0
 const mediaMini800 = ref(false)
-const remoteItem = ref<RemoteItem>({} as RemoteItem)
-const patientInfo = ref({} as PatientInfoItem)
-
-initData(remoteStore.currentRemote)
+const remoteItem = ref({} as any)
+const patientInfo = ref({} as any)
+const remoteWsStore = useRemoteWsStore()
 
 defineExpose({
-    initData
-})
-
-onBeforeUnmount(() => {
-  // 页面卸载后清楚定时器
-  clearInterval(timer)
-})
-
-window.addEventListener('resize', () => {
-    mediaMini800.value = Boolean(window.innerWidth < 801)
+  initData, showData
 });
 
-function initData(e?: RemoteItem) {
-    const obj = e || {} as RemoteItem
-    remoteItem.value = obj
-    patientInfo.value.state = obj.dataAlarm
-    patientInfo.value.name = obj.patientName || ''
-    patientInfo.value.code = 'XXXXXX'
-    clearInterval(timer)
-    if(!patientInfo.value.name) return
-    timer = setInterval(() => {
-      getData()
-    }, 2000)
+window.addEventListener('resize', () => {
+  mediaMini800.value = Boolean(window.innerWidth < 801)
+});
+
+onUnmounted(() => {
+  remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
+})
+
+function showData(i: number) {
+  const lastTaskIndex = remoteWsStore.currentTaskIndex;
+  const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
+  if (lastTask) {
+    remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
+  }
+  remoteWsStore.currentTaskIndex = i
+  remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
+  getData()
+}
+
+function initData() {
+  remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
+  remoteWsStore.createConnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
+  getData()
 }
 
 function getData() {
-  remoteItem.value.dataAlarm = false
-  const obj = {
-    state: false,
-    BIS: Math.ceil(Math.random() * 100), 
-    SBP: Math.ceil(Math.random() * 100), 
-    SPO2: Math.ceil(Math.random() * 100), 
-    DBP: Math.ceil(Math.random() * 100), 
-    HR: Math.ceil(Math.random() * 100), 
-    TEMP: Math.ceil(Math.random() * 100),
-  } as PatientInfoItem
-  patientInfo.value.time = new Date()
-  setRemoteLog(obj, (title: string, size: string) => {
-    obj.state = true
-    remoteItem.value.dataAlarm = true
-    remoteStore.setRemoteLog({
-      time: new Date(),
-      title,
-      state: '异常'
-    }, remoteItem.value.index)
+	remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
+  remoteWsStore.subscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, (res: any) => {
+    const data = JSON.parse(res.data);
+    if (data.vitalSignsList && data.vitalSignsList.length > 0) {
+      Object.assign(patientInfo.value, data.vitalSignsList[0]);
+      patientInfo.value.state = (patientInfo.value.BIS_except || patientInfo.value.SBP_except ||
+        patientInfo.value.DBP_except || patientInfo.value.HR_except);
+      setLog(patientInfo.value)
+      emit('addLogAfter')
+    }
+  })
+}
+
+function setLog(data: any) {
+  remoteWsStore.exceptionType.forEach((item: any) => {
+    if (data[item]) {
+      const msg: any = remoteWsStore.exceptionMsg[item];
+      remoteWsStore.setRemoteLog({
+        state: msg,
+        taskName: remoteItem.value.taskName,
+        time: new Date(),
+        type: "exception"
+      }, remoteWsStore.currentTaskIndex);
+    }
   })
-  remoteStore.setRemoteDataAlarm(remoteItem.value.dataAlarm, remoteItem.value.index)
-  remoteStore.$patch({currentRemote: remoteStore.remoteTasks[remoteItem.value.index]})
-  Object.assign(patientInfo.value, obj)
-  emit('addLogAfter')
 }
 
 const breakRemote = () => {
-    remoteItem.value.isRemote = false
-    emit('breakRemote', remoteItem.value)
+  remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
+  remoteWsStore.resetRemoteTask(remoteWsStore.currentTaskIndex)
+  if (remoteWsStore.getActiveRemoteTask()) {
+    showData(remoteWsStore.getActiveRemoteTask())
+  }
+  emit('breakRemote')
 }
 
 </script>
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index dbe7637..d02b8ae 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -1,206 +1,200 @@
 <template>
-  <div class="remote-box" id="screenBox">
-    <div class="main-box">
-      <div class="left-box">
-        <h3>{{ useRemoteStore().getCurrentRemote().title }}</h3>
-        <chart-line ref="chartDom1" class="chart-line" :names="['BIS', 'HR']"
-                    :chartData="featureTable"></chart-line>
-        <chart-line ref="chartDom2" class="chart-line" :names="['SBP', 'DBP']"
-                    :chartData="featureTable"></chart-line>
-        <chart-line ref="chartDom3" class="chart-line" :names="['SPO2', 'TEMP']"
-                    :chartData="featureTable"></chart-line>
-        <chart-ecg ref="chartDom4" class="chart-ecg" :chartData="featureTable"></chart-ecg>
+	<div class="remote-box" id="screenBox">
+		<div class="main-box">
+			<div class="left-box">
+				<h3>{{ currentRemote.taskName }}</h3>
+				<chart-line ref="chartDom1" class="chart-line" :names="['BIS', 'HR']"
+										@exception-event="vitalExcepEvent"></chart-line>
+				<chart-line ref="chartDom2" class="chart-line" :names="['SBP', 'DBP']"
+										@exception-event="vitalExcepEvent"></chart-line>
+				<chart-line ref="chartDom3" class="chart-line" :names="['SPO2', 'TEMP']"
+										@exception-event="vitalExcepEvent"></chart-line>
+				<chart-ecg ref="chartDom4" class="chart-ecg" :name="['CH1', 'CH2']"
+									 @exception-event="vitalExcepEvent"></chart-ecg>
+			</div>
 
-      </div>
-      <div class="center-box">
-        <div class="body-box">
-          <div class="body-img">
-            <img src="@/assets/imgs/main_body.png" style="width: 100%;height: 100%;"/>
-            <img class="lung-img" :class="{ 'shake_1': lungAlarm }" :src="lungAlarm ? imgLungAlarm : imgLung">
-            <img class="heart-img" :class="{ 'shake_1': heartAlarm }"
-                 :src="heartAlarm ? imgHeartAlarm : imgHeart">
-          </div>
+			<div class="center-box">
+				<div class="body-box">
+					<div class="body-img">
+						<img src="@/assets/imgs/main_body.png" style="width: 100%;height: 100%;"/>
+						<img class="lung-img" :class="{ 'shake_1': lungAlarm }" :src="lungAlarm ? imgLungAlarm : imgLung">
+						<img class="heart-img" :class="{ 'shake_1': heartAlarm }"
+								 :src="heartAlarm ? imgHeartAlarm : imgHeart">
+					</div>
+				</div>
+				<div class="btn-box">
+					<el-button class="start-btn" color="#F80000" @click="startAI">
+						开始
+					</el-button>
+					<div class="right-btn-box">
+						<el-button :class="{ 'active': isAIDose }" size="small" @click="">AI给药</el-button>
+						<el-button :class="{ 'active': !isAIDose }" size="small">人工给药</el-button>
+					</div>
+				</div>
+			</div>
 
-        </div>
-        <div class="btn-box">
-          <el-button class="start-btn" color="#F80000" @click="getTableData(!isStart)">{{
-              isStart ? '终止' : '开始'
-            }}
-          </el-button>
-          <div class="right-btn-box">
-            <el-button :class="{ 'active': isAIDose }" size="small" @click="getTableData(true)">AI给药</el-button>
-            <el-button :class="{ 'active': !isAIDose }" size="small"
-                       @click="getTableData(false)">人工给药
-            </el-button>
-          </div>
-        </div>
-      </div>
-      <div class="right-box">
-        <div class="top-btn-box">
-          <div class="top-left-btn-box">
-            <el-select v-model="database" filterable placeholder="Select" style="width: 100%;"
-                       @change="selectDatabase">
-              <el-option v-for="item in databaseOptions" :key="item.value" :label="item.label"
-                         :value="item.value"/>
-            </el-select>
-            <el-button color="#C77000" @click="viewPatientInfo">患者信息</el-button>
-            <el-button color="#C77000">已连接</el-button>
-            <el-button color="#C77000">机器人运行正常</el-button>
-          </div>
-          <el-button color="#e0e0e0" @click="backRemote">
-            <el-icon>
-              <Back/>
-            </el-icon>
-            返回
-          </el-button>
-        </div>
-        <div class="monitoring-message">
-          <div class="left-box">
-            <span class="unusual-title">异常信息</span>
-            <ul ref="unusualMsg" class="unusual-box">
-              <li v-for="item in unusual" :key="item">{{ item }}</li>
-            </ul>
-          </div>
-          <div class="right-box">
-            <div class="video-box" @click="playPause">
-              <div class="icon-box">
-                <el-icon v-if="isVideoPlay">
-                  <VideoPause/>
-                </el-icon>
-                <el-icon v-else>
-                  <VideoPlay/>
-                </el-icon>
-              </div>
-              <!--  poster="@/assets/imgs/video_bck.png" -->
-              <video ref="liveVideo">
-                <source src="@/assets/medical.mp4" type="video/mp4"/>
-              </video>
-            </div>
-            <div class="message-box">
-              <ul ref="msgLog" class="message-log">
-                <li v-for="(item, index) in mssageList" :key="'msg-log-' + index"
-                    :class="{ 'align-right': item.user === userName }">
-                  <span>{{ item.msg }}</span>
-                </li>
-              </ul>
-              <div class="send-box">
-                <el-input v-model="msgVal" placeholder="请输入消息"/>
-                <el-button color="#006080" @click="sendMsg">发送消息</el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- table1 -->
-        <div class="table-box">
-          <el-table :data="tableData" height="100%" style="width: 100%">
-            <el-table-column prop="num" label="票号" width="40" align="center"/>
-            <el-table-column prop="name" label="药物名称" align="center"/>
-            <el-table-column prop="speed" label="速度(ml/h)" width="120">
-              <template #header>
-                <el-dropdown @command="table1SpeedCommand">
+			<div class="right-box">
+				<div class="top-btn-box">
+					<div class="top-left-btn-box">
+						<el-select v-model="database" filterable placeholder="Select" style="width: 100%;"
+											 @change="selectDatabase">
+							<el-option v-for="item in databaseOptions" :key="item.value" :label="item.label"
+												 :value="item.value"/>
+						</el-select>
+						<el-button color="#C77000" @click="viewPatientInfo">患者信息</el-button>
+						<el-button color="#C77000">已连接</el-button>
+						<el-button color="#C77000">机器人运行正常</el-button>
+					</div>
+					<el-button color="#e0e0e0" @click="backRemote">
+						<el-icon>
+							<Back/>
+						</el-icon>
+						返回
+					</el-button>
+				</div>
+				<div class="monitoring-message">
+					<div class="left-box">
+						<span class="unusual-title">异常信息</span>
+						<ul ref="unusualMsgRef" class="unusual-box">
+							<li v-for="item in unusual" :key="item">{{ item }}</li>
+						</ul>
+					</div>
+					<div class="right-box">
+						<div class="video-box" @click="playPause">
+							<div class="icon-box">
+								<el-icon v-if="isVideoPlay">
+									<VideoPause/>
+								</el-icon>
+								<el-icon v-else>
+									<VideoPlay/>
+								</el-icon>
+							</div>
+							<!--  poster="@/assets/imgs/video_bck.png" -->
+							<video ref="liveVideo">
+								<source src="@/assets/medical.mp4" type="video/mp4"/>
+							</video>
+						</div>
+						<div class="message-box">
+							<ul ref="msgLog" class="message-log">
+								<li v-for="(item, index) in mssageList" :key="'msg-log-' + index"
+										:class="{ 'align-right': item.createName == userName }">
+									<span>{{ item.content }}</span>
+								</li>
+							</ul>
+							<div class="send-box">
+								<el-input v-model="msgVal" placeholder="请输入消息"/>
+								<el-button color="#006080" @click="sendMsg">发送消息</el-button>
+							</div>
+						</div>
+					</div>
+				</div>
+				<!-- table1 -->
+				<div class="table-box">
+					<el-table :data="varTableData" height="100%" style="width: 100%">
+						<el-table-column prop="num" label="票号" width="40" align="center"/>
+						<el-table-column prop="name" label="药物名称" align="center"/>
+						<el-table-column prop="speed" label="速度(ml/h)" width="120">
+							<template #header>
+								<el-dropdown @command="table1SpeedCommand">
                   <span style="color: white;font-size: 14px;line-height: 20px;">
                     {{ table1SpeedVal || '请选择速度' }}
                   </span>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item command="速度(ug/kg/min)">速度(ug/kg/min)</el-dropdown-item>
-                      <el-dropdown-item command="速度(ml/h)">速度(ml/h)</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </template>
-            </el-table-column>
-            <el-table-column prop="total" label="累计药量(ml)" width="100">
-              <template #default="scope">—</template>
-            </el-table-column>
-            <el-table-column prop="state" label="工作状态" width="70" align="center"/>
-            <el-table-column label="特殊情况人为干预" align="center">
-              <template #default="scope">
-                <div class="table-btn-box">
-                  <el-button size="small" color="#006080" @click="tableItemPlus(scope)">
-                    <el-icon>
-                      <Plus/>
-                    </el-icon>
-                  </el-button>
-                  <el-button size="small" color="#006080" :disabled="scope.row.speed <= 0"
-                             @click="tableItemMinus(scope)">
-                    <el-icon>
-                      <Minus/>
-                    </el-icon>
-                  </el-button>
-                  <el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
-                             :disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定
-                  </el-button>
-                  <el-button size="small" color="#006080" @click="tableItemCancel(scope)"
-                             :disabled="tableDataStore[scope.$index].speed === scope.row.speed">取消
-                  </el-button>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!-- table2 -->
-        <div class="table-box">
-          <el-table :data="tableData" height="100%" style="width: 100%">
-            <el-table-column prop="num" label="票号" width="40" align="center"/>
-            <el-table-column prop="name" label="药物名称" align="center"/>
-            <el-table-column prop="speed" label="速度(ml/h)" width="100"/>
-            <el-table-column prop="total" label="累计药量(ml)" width="100">
-              <template #default="scope">—</template>
-            </el-table-column>
-            <el-table-column prop="state" label="工作状态" width="70" align="center"/>
-            <el-table-column label="特殊情况人为干预" align="center">
-              <template #default="scope">
-                <div class="table-btn-box">
-                  <el-button size="small" color="#006080" @click="tableItemPlus(scope)">
-                    <el-icon>
-                      <Plus/>
-                    </el-icon>
-                  </el-button>
-                  <el-button size="small" color="#006080" :disabled="scope.row.speed <= 0"
-                             @click="tableItemMinus(scope)">
-                    <el-icon>
-                      <Minus/>
-                    </el-icon>
-                  </el-button>
-                  <el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
-                             :disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定
-                  </el-button>
-                  <el-button size="small" color="#006080" @click="tableItemCancel(scope)"
-                             :disabled="tableDataStore[scope.$index].speed === scope.row.speed">取消
-                  </el-button>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-    </div>
+									<template #dropdown>
+										<el-dropdown-menu>
+											<el-dropdown-item command="速度(ug/kg/min)">速度(ug/kg/min)</el-dropdown-item>
+											<el-dropdown-item command="速度(ml/h)">速度(ml/h)</el-dropdown-item>
+										</el-dropdown-menu>
+									</template>
+								</el-dropdown>
+							</template>
+						</el-table-column>
+						<el-table-column prop="total" label="累计药量(ml)" width="100">
+							<template #default="scope">—</template>
+						</el-table-column>
+						<el-table-column prop="state" label="工作状态" width="70" align="center"/>
+						<el-table-column label="特殊情况人为干预" align="center">
+							<template #default="scope">
+								<div class="table-btn-box">
+									<el-button size="small" color="#006080" @click="tableItemPlus(scope)">
+										<el-icon>
+											<Plus/>
+										</el-icon>
+									</el-button>
+									<el-button size="small" color="#006080" :disabled="scope.row.speed <= 0"
+														 @click="tableItemMinus(scope)">
+										<el-icon>
+											<Minus/>
+										</el-icon>
+									</el-button>
+									<!--									<el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
+                                               :disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定-->
+									<el-button size="small" color="#006080" @click="tableItemConfirm(scope, varTableData)">确定
+									</el-button>
+									<el-button size="small" color="#006080" @click="tableItemCancel(scope, varTableData)">取消
+									</el-button>
+								</div>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+				<!-- table2 -->
+				<div class="table-box">
+					<el-table :data="fixedTableData" height="100%" style="width: 100%">
+						<el-table-column prop="num" label="票号" width="40" align="center"/>
+						<el-table-column prop="name" label="药物名称" align="center"/>
+						<el-table-column prop="speed" label="速度(ml/h)" width="100"/>
+						<el-table-column prop="total" label="累计药量(ml)" width="100">
+							<template #default="scope">—</template>
+						</el-table-column>
+						<el-table-column prop="state" label="工作状态" width="70" align="center"/>
+						<el-table-column label="特殊情况人为干预" align="center">
+							<template #default="scope">
+								<div class="table-btn-box">
+									<el-button size="small" color="#006080" @click="tableItemPlus(scope)">
+										<el-icon>
+											<Plus/>
+										</el-icon>
+									</el-button>
+									<el-button size="small" color="#006080" :disabled="scope.row.speed <= 0"
+														 @click="tableItemMinus(scope)">
+										<el-icon>
+											<Minus/>
+										</el-icon>
+									</el-button>
+									<el-button size="small" color="#006080" @click="tableItemConfirm(scope, fixedTableData)">确定
+									</el-button>
+									<el-button size="small" color="#006080" @click="tableItemCancel(scope, fixedTableData)">取消
+									</el-button>
+								</div>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
+		</div>
 
-    <el-dialog v-model="setDatabaseDialog" title="请选择需要查询的病人" width="300px" align-center>
-      <el-select v-model="database" filterable placeholder="Select" style="width: 100%;">
-        <el-option v-for="item in databaseOptions" :key="item.value" :label="item.label" :value="item.value"/>
-      </el-select>
-      <template #footer>
+		<el-dialog v-model="setDatabaseDialog" title="请选择需要查询的病人" width="300px" align-center>
+			<el-select v-model="database" filterable placeholder="Select" style="width: 100%;">
+				<el-option v-for="item in databaseOptions" :key="item.value" :label="item.label" :value="item.value"/>
+			</el-select>
+			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="setDatabaseDialog = false">取消</el-button>
 					<el-button type="primary" @click="setDatabase">确定</el-button>
 				</span>
-      </template>
-    </el-dialog>
-    <el-dialog v-model="isPatientDialog" title="患者信息" width="40%">
-      <PatientsForm ref="patientsFormRef" type="view" @close="isPatientDialog = false"/>
-    </el-dialog>
-  </div>
+			</template>
+		</el-dialog>
+		<el-dialog v-model="isPatientDialog" title="患者信息" width="40%">
+			<PatientsForm ref="patientsFormRef" type="view" @close="isPatientDialog = false"/>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import {onMounted, ref, reactive, onBeforeUnmount} from 'vue';
-import {useRouter, useRoute} from 'vue-router'
-import {ElMessageBox, ElMessage} from 'element-plus';
-import {useRemoteStore} from '@/stores/remote-info-store'
+import {onMounted, onUnmounted, reactive, ref} from 'vue';
+import {useRouter} from 'vue-router'
+import {ElMessage} from 'element-plus';
 import {dateFormater} from '@/utils/date-util';
-import {post} from "@/utils/request";
 import chartLine from './chart/chart-line.vue';
 import chartEcg from './chart/chart-ecg.vue';
 import PatientsForm from '@/views/patients-manage/form/patients-form.vue'
@@ -208,679 +202,586 @@ import imgLung from '@/assets/imgs/lung.png';
 import imgHeart from '@/assets/imgs/heart.png';
 import imgLungAlarm from '@/assets/imgs/lung_alarm.png';
 import imgHeartAlarm from '@/assets/imgs/heart_alarm.png';
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
+import {useLoginStore} from "@/stores/user-info-store";
+import {getPatientInfo} from "@/api/patient";
 
 
 const router = useRouter()
-const route = useRoute()
 
 const medicineCustom: any[] = [
-  {name: '丙泊酚', plus: 0.5, total: 50},
-  {name: '舒芬太尼', plus: 1, total: 100},
-  {name: '瑞芬太尼', plus: 0.05, total: 5},
-  {name: '顺阿曲库胺', plus: 0.02, total: 2},
-  {name: '尼卡地平', plus: 1, total: 100},
-  {name: '艾司洛尔', plus: 1, total: 100},
-  {name: '麻黄素', plus: 1, total: 100},
-  {name: '阿托品', plus: 1, total: 100},
-  {name: '罗库溴铵', plus: 0.1, total: 10}
-];
-let featureTimer = 0;
-let ecgTimer = 0;
-let aiFlagTimer = 0;
-let medicineTimer = 0;
-const currentRemote = useRemoteStore().getCurrentRemote()
+	{name: '丙泊酚', plus: 0.5, total: 50},
+	{name: '舒芬太尼', plus: 1, total: 100},
+	{name: '瑞芬太尼', plus: 0.05, total: 5},
+	{name: '顺阿曲库胺', plus: 0.02, total: 2},
+	{name: '尼卡地平', plus: 1, total: 100},
+	{name: '艾司洛尔', plus: 1, total: 100},
+	{name: '麻黄素', plus: 1, total: 100},
+	{name: '阿托品', plus: 1, total: 100},
+	{name: '罗库溴铵', plus: 0.1, total: 10}
+]
+const remoteWsStore = useRemoteWsStore()
+const currentRemote = ref(remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex])
+const userInfo = useLoginStore()
 
 const chartDom1 = ref(),
-    chartDom2 = ref(),
-    chartDom3 = ref(),
-    chartDom4 = ref(),
-    liveVideo = ref(),
-    msgLog = ref(),
-    unusualMsg = ref(),
-    patientsFormRef = ref();
+	chartDom2 = ref(),
+	chartDom3 = ref(),
+	chartDom4 = ref(),
+	liveVideo = ref(),
+	msgLog = ref(),
+	unusualMsgRef = ref(),
+	patientsFormRef = ref()
 
 const isPatientDialog = ref(false)
-const database = ref('');
-const databaseOptions = ref([] as { value: string, label: string }[]);
-const messageSum = ref(10);
-const userName = ref('admin');
+const database = ref('')
+const databaseOptions = ref([] as { value: string, label: string }[])
+const messageSum = ref(10)
+const userName = ref(userInfo.login.name)
 const setDatabaseDialog = ref(false);
 const featureTable = ref([] as any[]);
 let chartNowData = reactive({ID: 0});
 const lungAlarm = ref(false); // 肺部警告
 const heartAlarm = ref(false); // 心脏警告
-const isStart = ref(false); // 是否开始
 const isAIDose = ref(false); // 是否AI给药
 const isVideoPlay = ref(false); // 视频是否播放
 const videoSrc = ref('https://www.runoob.com/try/demo_source/mov_bbb.mp4');
 const mssageList = ref([] as any);
 const msgVal = ref('');
 const unusual = ref([] as any);
-const tableData = ref([] as any[]);
-const tableDataStore = ref([] as any[]);
-const table1SpeedVal = ref('')
+const fixedTableData = ref([] as any[]);
+const varTableData = ref([] as any[]);
+const table1SpeedVal = ref('');
+let currentAIMedicine: any;
+let currentDocMedicine: any;
+const medicineSpeedTemp: any = {};
 
-getDatabases();
 onMounted(() => {
-  if (currentRemote.isRemote) {
-
-  } else {
-    router.replace('/remote-manage/remote-manage')
-    return
-  }
-  msgLogScrollBottom();
-  getChartData(); // 定时任务
-  getAIFlag(); // 定时任务
-  getMedicine(); // 定时任务
-  initScale();
-
+	if (!currentRemote.value.isRemote) {
+		router.replace('/remote-manage/remote-manage');
+		return;
+	}
+	msgLogScrollBottom();
+	initScale();
+	subscribeWS();
+//	setTableData();
 });
-// 页面卸载前清除定时器
-onBeforeUnmount(() => {
-  clearInterval(featureTimer)
-  clearInterval(ecgTimer)
-  clearInterval(aiFlagTimer)
-  clearInterval(medicineTimer)
+
+onUnmounted(() => {
+	remoteWsStore.unsubscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
+	remoteWsStore.unsubscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
+	remoteWsStore.unsubscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date);
 })
 
+function subscribeWS() {
+	remoteWsStore.subscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
+		function (res: any) {
+			const data = JSON.parse(res.data);
+			chartDom1.value.updateChartData(data.vitalSignsList[0]);
+			chartDom2.value.updateChartData(data.vitalSignsList[0]);
+			chartDom3.value.updateChartData(data.vitalSignsList[0]);
+			chartDom4.value.updateChartData(data.vitalSignsList[0]);
+			updateMedicineTable(data.aiMedicineList[0], data.docMedicineList[0]);
+		})
+
+	remoteWsStore.subscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
+		function (res: any) {
+			mssageList.value.push(JSON.parse(res.data));
+		})
+
+	remoteWsStore.subscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date,
+		function (res: any) {
+			const data = JSON.parse(res.data);
+			if (data.status != 1) {
+				if (data.medicine) {
+					if (varTableData.value[data.medicine]) varTableData.value[data.medicine] = medicineSpeedTemp[data.medicine];
+					if (fixedTableData.value[data.medicine]) fixedTableData.value[data.medicine] = medicineSpeedTemp[data.medicine];
+				}
+			} else {
+				ElMessage.error(data.msg)
+			}
+		})
+}
+
 function initData() {
-  lungAlarm.value = false;
-  heartAlarm.value = false;
-  isStart.value = false;
-  isAIDose.value = false;
-  unusual.value = [];
-  mssageList.value = [];
-  tableData.value = [];
-  tableDataStore.value = [];
-  const currentRemote = useRemoteStore().getCurrentRemote() // 当前远程连接
-
-  getFeatureTable();
-  getMssageLog();
-  getTableData(isAIDose.value);
-  try {
-    msgLogScrollBottom();
-  } catch (error) {
-  }
-
+	lungAlarm.value = false;
+	heartAlarm.value = false;
+	isAIDose.value = false;
+	unusual.value = [];
+	mssageList.value = [];
+	fixedTableData.value = [];
+	varTableData.value = [];
+	featureTable.value = [];
+	try {
+		msgLogScrollBottom();
+	} catch (error) {
+	}
 }
 
-// AIFlagTable 表2秒获取一次
-function getAIFlag() {
-  let isRunTimer = true;
-  clearInterval(aiFlagTimer);
-  aiFlagTimer = setInterval(() => {
-    if (isRunTimer) {
-      isRunTimer = false;
-      post('/getaiflag', {database: database.value, start: 0, end: 1}, (res: any) => {
-        if (res.status === 200 && res.data.length > 0) {
-          const flag = Boolean(res.data[0].Flag);
-          if (isAIDose.value !== flag) getTableData(Boolean(res.data[0].Flag));
-        }
-        isRunTimer = true;
-      });
-    }
-  }, 2000);
+function updateMedicineTable(aiMedicine: any, doctorMedicine: any) {
+	if (aiMedicine) {
+		delete aiMedicine._id;
+		delete aiMedicine.Time;
+		if (currentAIMedicine && currentAIMedicine.Time == aiMedicine.Time) {
+		} else {
+			currentAIMedicine = aiMedicine;
+			const keys = Object.keys(aiMedicine);
+			keys.forEach(key => {
+				medicineSpeedTemp[key] = aiMedicine[key];
+			})
+			if (varTableData.value.length > 0) {
+				varTableData.value.forEach((medicine: any) => {
+					medicine.speed = aiMedicine[medicine.name];
+				})
+				fixedTableData.value.forEach((medicine: any) => {
+					medicine.speed = aiMedicine[medicine.name];
+				})
+			} else {
+				const varTable: any = [];
+				const fixedTable: any = [];
+				keys.forEach(key => {
+					const medicine = {
+						Phase: 0,
+						name: key,
+						speed: aiMedicine[key],
+						total: 0,
+						state: "正常"
+					}
+					if (remoteWsStore.varMedicine.includes(key)) {
+						varTable.push(medicine);
+					} else {
+						fixedTable.push(medicine);
+					}
+				})
+				varTableData.value = varTable;
+				fixedTableData.value = fixedTable;
+			}
+		}
+	}
+
+	if (doctorMedicine) {
+		delete doctorMedicine._id;
+		delete doctorMedicine.Time;
+		if (currentDocMedicine && currentDocMedicine.Time == doctorMedicine.Time) {
+		} else {
+			currentDocMedicine = doctorMedicine;
+			const keys = Object.keys(doctorMedicine);
+			keys.forEach(key => {
+				medicineSpeedTemp[key] = doctorMedicine[key];
+			})
+
+			if (varTableData.value.length > 0) {
+				varTableData.value.forEach((medicine: any) => {
+					medicine.speed = doctorMedicine[medicine.name];
+				});
+				fixedTableData.value.forEach((medicine: any) => {
+					medicine.speed = doctorMedicine[medicine.name];
+				})
+			} else {
+				const varTable: any = [];
+				const fixedTable: any = [];
+				keys.forEach(key => {
+					const medicine = {
+						Phase: 0,
+						name: key,
+						speed: aiMedicine[key],
+						total: 0,
+						state: "正常"
+					}
+					if (remoteWsStore.varMedicine.includes(key)) {
+						varTable.push(medicine);
+					} else {
+						fixedTable.push(medicine);
+					}
+				})
+				varTableData.value = varTable;
+				fixedTableData.value = fixedTable;
+			}
+		}
+	}
 }
 
-function setTableData(res: any) {
-  if (res.data.length > 0) {
-    let i = 0;
-    const ary: any = [];
-    for (let key in res.data[0]) {
-      if (key !== 'ID' && key !== 'Phase' && key !== 'Time' && key !== 'TIME') {
-        i++;
-        ary.push({
-          Phase: res.data[0].Phase,
-          num: i,
-          name: key,
-          speed: res.data[0][key],
-          total: medicineCustom.find(o => o.name === key)?.total,
-          state: '正常'
-        });
-      }
-    }
-    tableData.value = ary;
-
-  } else {
-    const defaultMedicine: string[] = ['丙泊酚', '舒芬太尼', '瑞芬太尼', '顺阿曲库胺', '尼卡地平', '艾司洛尔', '麻黄素', '阿托品'];
-    const ary: any = [];
-    defaultMedicine.forEach((item, index) => {
-      ary.push({
-        Phase: 1,
-        num: index + 1,
-        name: item,
-        speed: 0,
-        total: medicineCustom.find(o => o.name === item)?.total,
-        state: '正常'
-      });
-    });
-    tableData.value = ary;
-  }
-  tableDataStore.value = JSON.parse(JSON.stringify(tableData.value));
+function vitalExcepEvent(data: any) {
+	logUpdate(data)
 }
 
-// AIMedicineTable、DoctorMedicineTable 表2秒获取一次
-function getMedicine() {
-  let isRunTimer = true;
-  clearInterval(medicineTimer);
-  medicineTimer = setInterval(() => {
-    if (isRunTimer && JSON.stringify(tableDataStore) === JSON.stringify(tableData) && isAIDose.value) {
-      isRunTimer = false;
-      const url = isAIDose.value ? '/getaimedicine' : '/getdoctormedicine';
-      post(url, {database: database.value, start: 0, end: 1}, (res: any) => {
-        if (res.status === 200) {
-          setTableData(res);
-        }
-        isRunTimer = true;
-      });
-    }
-  }, 2000);
-}
-
-// FeatureTable 表2秒获取一次
-function getChartData() {
-  let isRunTimer = true;
-  clearInterval(featureTimer);
-  clearInterval(ecgTimer);
-  featureTimer = setInterval(() => {
-    if (isRunTimer) {
-      getData()
-    }
-  }, 2000);
-  ecgTimer = setInterval(() => {
-    try {
-      chartDom4.value.updateChart(0, new Date());
-    } catch (error) {
-    }
-  }, 1000);
-
-  function getData() {
-    isRunTimer = false;
-    post('/getfeature', {database: database.value, start: 0, end: 1}, (res: any) => {
-      const obj = (res.data && res.data[0]) || {};
-      if (obj.ID !== chartNowData.ID) {
-        chartNowData = obj;
-        const isHR = obj.HR >= 50 && obj.HR <= 80;
-        const isSBP = obj.SBP >= 90 && obj.SBP <= 120;
-        const isDBP = obj.DBP >= 60 && obj.DBP <= 90;
-        // const isST = obj.ST >= -0.2 && obj.ST <= 0.2;
-        if (!isHR) unusualUpDate('心率异常');
-        if (!isSBP) unusualUpDate('收缩压异常');
-        if (!isDBP) unusualUpDate('舒张异常');
-        // if (!isST) unusualUpDate('心电图ST段变异度异常');
-        lungAlarm.value = Boolean(!isSBP || !isDBP);
-        // heartAlarm.value = Boolean(!isHR || !isST);
-        heartAlarm.value = Boolean(!isHR);
-        chartDom1.value.updateChart([obj.BIS, obj.HR], obj.Time || obj.TIME);
-        chartDom2.value.updateChart([obj.SBP, obj.DBP], obj.Time || obj.TIME);
-        chartDom3.value.updateChart([obj.SPO2, obj.TEMP], obj.Time || obj.TIME);
-        // chartDom4.value.updateChart(obj.ST, obj.Time || obj.TIME);
-      }
-      isRunTimer = true;
-    });
-  }
-}
-
-function getFeatureTable() {
-  featureTable.value = [];
-  post('/getfeature', {database: database.value, start: 1, end: 50}, (res: any) => {
-    if (res.status === 200) {
-      featureTable.value = res.data.reverse();
-      setTimeout(() => {
-        chartDom1.value.chartSet();
-        chartDom2.value.chartSet();
-        chartDom3.value.chartSet();
-        chartDom4.value.chartSet();
-      }, 0);
-    } else {
-      ElMessage({
-        message: res.message,
-        type: 'error',
-      });
-    }
-  });
-}
-
-function getDatabases() {
-  post('/getdatabases', {}, (res: any) => {
-    if (res.status === 200) {
-      databaseOptions.value = [];
-      const hideDatabase = ['information_schema', 'mysql', 'performance_schema', '北工大412824200020002000', '数据模拟412824200020002000'];
-      res.data.forEach((item: any, index: number) => {
-        if (!hideDatabase.some(e => e === item.Database)) databaseOptions.value.push({
-          value: item.Database,
-          label: item.Database
-        });
-      })
-      database.value = databaseOptions.value[0].label;
-      initData();
-    }
-  });
-}
-
-function msgLogScrollBottom() {
-  msgLog.value.scrollTo({
-    top: msgLog.value.scrollHeight,
-    behavior: 'smooth'
-  });
-}
-
-function unusualUpDate(msg: string) {
-  unusual.value.push(dateFormater('HH:mm:ss') + msg);
-  setTimeout(() => {
-    unusualMsg.value.scrollTo({
-      top: unusualMsg.value.scrollHeight,
-      behavior: 'smooth'
-    });
-  });
-}
-
-function getMssageLog() {
-  mssageList.value.push({user: 'admin', msg: '请您把治疗单和药品给我'});
-  mssageList.value.push({user: 'nurse', msg: '好的'});
-  mssageList.value.push({user: 'admin', msg: '请您把治疗单和药品给我'});
-  mssageList.value.push({user: 'nurse', msg: '好的'});
-}
-
-function getTableData(e: boolean) {
-  if (tableData.value.length > 0 && e === isAIDose.value) return;
-  // 人工转ai 人工给药数据插到ai给药表
-  let promise = () => {
-    return new Promise((resolve, reject) => {
-      if (e && tableDataStore.value.length > 0) {
-        let key = `Phase`;
-        let value = `${tableDataStore.value[0].Phase}`;
-        tableDataStore.value.forEach(item => {
-          key += `, ${item.name}`;
-          value += `, ${item.speed}`;
-        });
-        post('/addaimedicine', {database: database.value, key, value}, (res: any) => {
-          if (res.status === 200) {
-            tableDataStore.value = JSON.parse(JSON.stringify(tableData.value));
-          }
-          resolve(true)
-        });
-      } else {
-        resolve(false)
-      }
-    })
-  }
-  promise().then((e: any) => {
-    isStart.value = e;
-    isAIDose.value = e;
-    const url = e ? '/getaimedicine' : '/getdoctormedicine';
-    post(url, {database: database.value, start: 0, end: 1}, (res: any) => {
-      if (res.status === 200) {
-        setTableData(res);
-      }
-    });
-    post('/addaiflag', {database: database.value, flag: e ? 1 : 0}, (res: any) => {
-      // console.log(res.status);
-    })
-  });
+function logUpdate(msg: string) {
+	unusual.value.push(dateFormater('HH:mm:ss') + msg);
+	setTimeout(() => {
+		unusualMsgRef.value.scrollTo({
+			top: unusualMsgRef.value.scrollHeight,
+			behavior: 'smooth'
+		});
+	});
 }
 
 // table 速度选择
 function table1SpeedCommand(e: any) {
-  table1SpeedVal.value = e
+	table1SpeedVal.value = e
 }
+
+
 function keepFit(designWidth: number, designHeight: number, renderDomId: string) {
-  let width = designWidth || 1920,
-      height = designHeight || 1010;
-  let clientHeight = document.documentElement.clientHeight - 50;
-  let clientWidth = document.documentElement.clientWidth;
-  let scale = 1;
-  scale = (clientHeight / clientWidth) < (height / width) ? clientHeight / height : clientWidth / width;
-  // scale = clientHeight / height;
-  // scale = clientWidth / width;
-  const renderDom = document.getElementById(renderDomId);
-  if (renderDom) {
-    renderDom.style.height = clientHeight / scale + 'px';
-    renderDom.style.width = clientWidth / scale + 'px';
-    renderDom.style.transform = 'scale(' + scale + ')';
-  }
+	let width = designWidth || 1920,
+		height = designHeight || 1010;
+	let clientHeight = document.documentElement.clientHeight - 50;
+	let clientWidth = document.documentElement.clientWidth;
+	let scale = 1;
+	scale = (clientHeight / clientWidth) < (height / width) ? clientHeight / height : clientWidth / width;
+	// scale = clientHeight / height;
+	// scale = clientWidth / width;
+	const renderDom = document.getElementById(renderDomId);
+	if (renderDom) {
+		renderDom.style.height = clientHeight / scale + 'px';
+		renderDom.style.width = clientWidth / scale + 'px';
+		renderDom.style.transform = 'scale(' + scale + ')';
+	}
 }
 
 function initScale() {
-  let w = 1920,
-      h = 1010;
-  keepFit(w, h, 'screenBox');
-  window.addEventListener('resize', () => {
-    keepFit(w, h, 'screenBox');
-  });
+	let w = 1920,
+		h = 1010;
+	keepFit(w, h, 'screenBox');
+	window.addEventListener('resize', () => {
+		keepFit(w, h, 'screenBox');
+	});
 }
 
 const selectDatabase = (value: any) => {
-  initData();
+	initData();
 };
 const setDatabase = () => {
-  initData();
-  setDatabaseDialog.value = false;
+	initData();
+	setDatabaseDialog.value = false;
 };
+
 const viewPatientInfo = () => {
-  isPatientDialog.value = true;
-  setTimeout(() => {
-    patientsFormRef.value.resetData()
-    patientsFormRef.value.formData = JSON.parse(JSON.stringify({
-      id: '',
-      name: '测试',
-      code: 'afasf',
-      sex: '男',
-      dept: '测试',
-      bodyHeight: '170',
-      isMedicalHistory: '无',
-      bodyWeight: '80',
-      medicalHistoryName: '无',
-      age: '22',
-      allergyHistoryName: '无',
-      phone: '123456',
-      hospitalTime: new Date()
-    }))
-  }, 0)
+	getPatientInfo(currentRemote.value.patient, currentRemote.value.patientId,
+		currentRemote.value.date).then(res => {
+		console.log(res)
+	})
+	isPatientDialog.value = true;
+	setTimeout(() => {
+		patientsFormRef.value.resetData()
+		patientsFormRef.value.formData = JSON.parse(JSON.stringify({
+			id: '',
+			name: '测试',
+			code: 'afasf',
+			sex: '男',
+			dept: '测试',
+			bodyHeight: '170',
+			isMedicalHistory: '无',
+			bodyWeight: '80',
+			medicalHistoryName: '无',
+			age: '22',
+			allergyHistoryName: '无',
+			phone: '123456',
+			hospitalTime: new Date()
+		}))
+	}, 0)
 }
 const backRemote = () => {
-  router.back()
+	router.back()
 }
 const playPause = () => {
-  if (liveVideo.value.paused) {
-    liveVideo.value.play(); // 播放视频
-    isVideoPlay.value = true;
-  } else {
-    liveVideo.value.pause(); // 暂停视频
-    isVideoPlay.value = false;
-  }
+	if (liveVideo.value.paused) {
+		liveVideo.value.play(); // 播放视频
+		isVideoPlay.value = true;
+	} else {
+		liveVideo.value.pause(); // 暂停视频
+		isVideoPlay.value = false;
+	}
 }
 const sendMsg = () => {
-  if (msgVal.value.trim() == '') return;
-  mssageList.value.push({user: userName.value, msg: msgVal.value});
-  msgVal.value = '';
-  setTimeout(() => {
-    msgLogScrollBottom()
-  }, 0);
-};
+	if (msgVal.value.trim() == '') return;
+	remoteWsStore.sendMsg(currentRemote.value.patient, currentRemote.value.patientId,
+		currentRemote.value.date, msgVal.value, function (res: any) {
+			if (res.code == 1) {
+				ElMessage.error(res.msg)
+			}
+		})
+	msgVal.value = '';
+	setTimeout(() => {
+		msgLogScrollBottom()
+	}, 0);
+}
+
+function msgLogScrollBottom() {
+	msgLog.value.scrollTo({
+		top: msgLog.value.scrollHeight,
+		behavior: 'smooth'
+	});
+}
+
 const tableItemPlus = (e: any) => {
-  const obj = medicineCustom.find(item => item.name === e.row.name) || {plus: 1};
-  e.row.speed += obj.plus;
-  e.row.speed = Number(e.row.speed.toFixed(2));
-};
+	const obj = medicineCustom.find(item => item.name === e.row.name) || {plus: 1};
+	e.row.speed += obj.plus;
+	e.row.speed = Number(e.row.speed.toFixed(2));
+}
+
 const tableItemMinus = (e: any) => {
-  const obj = medicineCustom.find(item => item.name === e.row.name) || {plus: 1};
-  if (!isAIDose.value && e.row.speed - obj.plus <= 0) return;
-  e.row.speed -= obj.plus;
-  if (e.row.speed < 0) e.row.speed = 0;
-  else e.row.speed = Number(e.row.speed.toFixed(2));
-};
-const tableItemConfirm = (e: any) => {
-  tableDataStore.value[e.$index].speed = e.row.speed;
-  if (tableData.value.length < 1) return;
-  let key = `Phase`;
-  let value = `${tableData.value[0].Phase}`;
-  tableData.value.forEach(item => {
-    key += `, ${item.name}`;
-    value += `, ${item.speed}`;
-  });
-  post(isAIDose.value ? '/addaimedicine' : '/adddoctormedicine', {database: database.value, key, value}, (res: any) => {
-    if (res.status === 200) {
-      tableDataStore.value = JSON.parse(JSON.stringify(tableData.value));
-      ElMessage({
-        message: '保存成功！',
-        type: 'success',
-      });
-      // 如果是ai药量表保存后同时在人工表中插入ai药量表数据
-      if (isAIDose.value) {
-        post('/adddoctormedicine', {database: database.value, key, value}, (res: any) => {
-          if (res.status === 200) {
-            ElMessage({
-              message: '保存成功！',
-              type: 'success',
-            });
-            getTableData(false); // 保存成功后切换为人工给药
-          } else {
-            ElMessage({
-              message: JSON.stringify(res),
-              type: 'error',
-            });
-          }
-        });
-      }
-    } else {
-      ElMessage({
-        message: JSON.stringify(res),
-        type: 'error',
-      });
-    }
-  });
-};
+	const obj = medicineCustom.find(item => item.name === e.row.name) || {plus: 1};
+	if (!isAIDose.value && e.row.speed - obj.plus <= 0) return;
+	e.row.speed -= obj.plus;
+	if (e.row.speed < 0) e.row.speed = 0;
+	else e.row.speed = Number(e.row.speed.toFixed(2));
+}
+
+const tableItemConfirm = (e: any, tableData: any) => {
+	if (tableData.length < 1) return;
+	const params = {
+		name: currentRemote.value.patient,
+		id: currentRemote.value.patientId,
+		date: currentRemote.value.date,
+		flag: "1",
+		medicine: e.row.name,
+		value: e.row.speed
+	}
+	remoteWsStore.sendMedicine(params, function () {
+	});
+}
+
 const tableItemCancel = (e: any) => {
-  e.row.speed = tableDataStore.value[e.$index].speed;
-};
+	e.row.speed = medicineSpeedTemp[e.row.name];
+}
+
+function startAI() {
+	const params = {
+		name: currentRemote.value.patient,
+		id: currentRemote.value.patientId,
+		date: currentRemote.value.date,
+		flag: "0",
+	}
+	remoteWsStore.sendMedicine(params, function () {
+	});
+}
 
 </script>
 
 <style lang="scss" scoped>
 .remote-box {
-  width: 1920px;
-  height: 1010px;
-  background: #f1f3f5;
-  padding: 10px 0 20px 0;
-  transform-origin: top left;
-  overflow-y: auto;
+	width: 1920px;
+	height: 1010px;
+	background: #f1f3f5;
+	padding: 10px 0 20px 0;
+	transform-origin: top left;
+	overflow-y: auto;
 
-  .el-button {
-    color: white;
-  }
+	.el-button {
+		color: white;
+	}
 
-  .main-box {
-    width: 100%;
-    height: 100%;
-    background: white;
-    padding: 20px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
+	.main-box {
+		width: 100%;
+		height: 100%;
+		background: white;
+		padding: 20px;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
 
-    .left-box {
-      width: 670px;
-      height: 100%;
+		.left-box {
+			width: 670px;
+			height: 100%;
 
-      & > h3 {
-        font-size: 26px;
-        color: $main-color;
-        line-height: 30px;
-        margin-bottom: 20px;
-        font-weight: 600;
-      }
+			& > h3 {
+				font-size: 26px;
+				color: $main-color;
+				line-height: 30px;
+				margin-bottom: 20px;
+				font-weight: 600;
+			}
 
-      .chart-line {
-        width: 100%;
-        height: calc(25% - 30px);
-        margin-bottom: 20px;
-        background: #e8f5f8;
-        border-top-left-radius: 20px;
-        border-top-right-radius: 20px;
-        // overflow: hidden;
-      }
+			.chart-line {
+				width: 100%;
+				height: calc(25% - 30px);
+				margin-bottom: 20px;
+				background: #e8f5f8;
+				border-top-left-radius: 20px;
+				border-top-right-radius: 20px;
+				// overflow: hidden;
+			}
 
-      .chart-ecg {
-        width: 100%;
-        height: calc(25% - 50px);
-        border-left: 1px solid #92b3c1;
-        border-bottom: 1px solid #92b3c1;
+			.chart-ecg {
+				width: 100%;
+				height: calc(25% - 50px);
+				border-left: 1px solid #92b3c1;
+				border-bottom: 1px solid #92b3c1;
 
-        &::before {
-          content: '';
-          position: absolute;
-          width: 0;
-          height: 0;
-          top: 0;
-          left: -5px;
-          border-left: 5px solid transparent;
-          border-right: 5px solid transparent;
-          border-bottom: 15px solid #285e7d;
-          border-top: 0;
-        }
+				&::before {
+					content: '';
+					position: absolute;
+					width: 0;
+					height: 0;
+					top: 0;
+					left: -5px;
+					border-left: 5px solid transparent;
+					border-right: 5px solid transparent;
+					border-bottom: 15px solid #285e7d;
+					border-top: 0;
+				}
 
-        &::after {
-          content: '';
-          position: absolute;
-          width: 0;
-          height: 0;
-          bottom: -5px;
-          right: 0;
-          border-left: 15px solid #285e7d;
-          border-right: 0;
-          border-bottom: 5px solid transparent;
-          border-top: 5px solid transparent;
-        }
-      }
-    }
+				&::after {
+					content: '';
+					position: absolute;
+					width: 0;
+					height: 0;
+					bottom: -5px;
+					right: 0;
+					border-left: 15px solid #285e7d;
+					border-right: 0;
+					border-bottom: 5px solid transparent;
+					border-top: 5px solid transparent;
+				}
+			}
+		}
 
-    .center-box {
-      width: calc(100% - 1500px);
-      min-width: 500px;
-      height: 100%;
+		.center-box {
+			width: calc(100% - 1500px);
+			min-width: 500px;
+			height: 100%;
 
-      .body-box {
-        width: 100%;
-        height: calc(100% - 110px);
-        display: flex;
-        justify-content: center;
-        align-items: center;
+			.body-box {
+				width: 100%;
+				height: calc(100% - 110px);
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-        .body-img {
-          position: relative;
-          // width: 400px;
-          // height: 650px;
-          width: 500px;
-          height: 812.5px;
-          min-height: 650px;
+				.body-img {
+					position: relative;
+					// width: 400px;
+					// height: 650px;
+					width: 500px;
+					height: 812.5px;
+					min-height: 650px;
 
-          .lung-img {
-            position: absolute;
-            width: 500px;
-            height: auto;
-            top: 240px;
-            left: 0;
-            transition: all 2s;
-          }
+					.lung-img {
+						position: absolute;
+						width: 500px;
+						height: auto;
+						top: 240px;
+						left: 0;
+						transition: all 2s;
+					}
 
-          .heart-img {
-            position: absolute;
-            width: 500px;
-            height: auto;
-            top: 420px;
-            left: 0;
-            transition: all 2s;
-          }
-        }
-      }
+					.heart-img {
+						position: absolute;
+						width: 500px;
+						height: auto;
+						top: 420px;
+						left: 0;
+						transition: all 2s;
+					}
+				}
+			}
 
-      .btn-box {
-        position: relative;
-        width: 100%;
-        height: 110px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+			.btn-box {
+				position: relative;
+				width: 100%;
+				height: 110px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-        .start-btn {
-          width: 230px;
-          height: 40px;
-          font-size: 20px;
-          border-radius: 16px;
-          font-weight: 600;
-        }
+				.start-btn {
+					width: 230px;
+					height: 40px;
+					font-size: 20px;
+					border-radius: 16px;
+					font-weight: 600;
+				}
 
-        .right-btn-box {
-          position: absolute;
-          width: 100px;
-          height: 62px;
-          top: calc(50% - 31px);
-          right: 0;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				.right-btn-box {
+					position: absolute;
+					width: 100px;
+					height: 62px;
+					top: calc(50% - 31px);
+					right: 0;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
 
-          .el-button {
-            width: 100%;
-            padding: 0;
-            height: 25px;
-            line-height: 22px;
-            border: 1px solid #e0e0e0;
-            color: #616161;
+					.el-button {
+						width: 100%;
+						padding: 0;
+						height: 25px;
+						line-height: 22px;
+						border: 1px solid #e0e0e0;
+						color: #616161;
 
-            &.active {
-              background: $main-color;
-              color: white;
-            }
+						&.active {
+							background: $main-color;
+							color: white;
+						}
 
-            &:last-of-type {
-              margin: 0;
-            }
-          }
-        }
-      }
-    }
+						&:last-of-type {
+							margin: 0;
+						}
+					}
+				}
+			}
+		}
 
-    .right-box {
-      width: 670px;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
+		.right-box {
+			width: 670px;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
 
-      .top-btn-box {
-        width: 100%;
-        height: 34px;
-        margin-bottom: 5px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+			.top-btn-box {
+				width: 100%;
+				height: 34px;
+				margin-bottom: 5px;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 
-        .top-left-btn-box {
-          display: flex;
-          align-items: center;
+				.top-left-btn-box {
+					display: flex;
+					align-items: center;
 
-          .el-select {
-            margin-right: 10px;
-          }
-        }
+					.el-select {
+						margin-right: 10px;
+					}
+				}
 
-        .el-button {
-          border-radius: 16px;
-          height: 31px;
-          background-color: transparent;
-          color: #c77000;
-        }
+				.el-button {
+					border-radius: 16px;
+					height: 31px;
+					background-color: transparent;
+					color: #c77000;
+				}
 
-        & > .el-button {
-          border-radius: 4px;
-          background-color: #f2f3f5;
-          color: $main-color;
-        }
-      }
+				& > .el-button {
+					border-radius: 4px;
+					background-color: #f2f3f5;
+					color: $main-color;
+				}
+			}
 
-      .monitoring-message {
-        width: 670px;
-        height: 450px;
-        padding-bottom: 10px;
-        display: flex;
-        justify-content: space-between;
+			.monitoring-message {
+				width: 670px;
+				height: 450px;
+				padding-bottom: 10px;
+				display: flex;
+				justify-content: space-between;
 
-        & > .left-box {
-          position: relative;
-          width: 200px;
-          height: 100%;
+				& > .left-box {
+					position: relative;
+					width: 200px;
+					height: 100%;
 
-          .unusual-title {
-            display: block;
-            width: 100%;
-            line-height: 38px;
-            color: #C77000;
-            font-size: 20px;
-            text-align: center;
-            border: 1px dashed #C1C1C1;
-            border-radius: 10px;
-          }
+					.unusual-title {
+						display: block;
+						width: 100%;
+						line-height: 38px;
+						color: #C77000;
+						font-size: 20px;
+						text-align: center;
+						border: 1px dashed #C1C1C1;
+						border-radius: 10px;
+					}
 
           .unusual-box {
             width: 100%;
diff --git a/src/views/remote-manage/remote-manage.vue b/src/views/remote-manage/remote-manage.vue
index b32a201..8adaabe 100644
--- a/src/views/remote-manage/remote-manage.vue
+++ b/src/views/remote-manage/remote-manage.vue
@@ -1,11 +1,5 @@
 <template>
 	<div class="remote-manage-page">
-		<button @click="getSurgeryData">123</button>
-		<button @click="disconnectSurgeryData">断开</button>
-		<button @click="sendMsg">发送消息</button>
-		<button @click="closeChat">关闭消息</button>
-		<button @click="addMedicine">给药</button>
-		<button @click="closeAddMedicineWS">关闭给药</button>
 		<div class="header-box">
 			<div class="thumbnail" @click="viewThumbnail">
 				<el-icon>
@@ -14,9 +8,9 @@
 				<span>缩略图</span>
 			</div>
 			<div class="task-btn-item" v-for="(item, index) in remoteTask" :key="'task-' + index"
-					 :class="{ 'connecting': item.patientName || item.patientCode, 'alarm': item.dataAlarm }"
-					 @click="editTask(item, index)" @dblclick="toRemoteControl(item, index)">
-				<span>{{ item.title || ('新建任务' + (index + 1)) }}</span>
+					 :class="{ 'connecting': item.patient || item.patientId, 'alarm': item.isException }"
+					 @click="editTask(item)" @dblclick="toRemoteControl(item)">
+				<span>{{ item.taskName || ('新建任务' + (index + 1)) }}</span>
 			</div>
 		</div>
 		<div class="content-box">
@@ -32,65 +26,26 @@
 </template>
 
 <script lang='ts' setup>
-import {ref} from 'vue'
+import {onMounted, ref} from 'vue'
 import {useRouter} from 'vue-router'
-import {useRemoteStore} from '@/stores/remote-info-store'
-import type {RemoteItem} from '@/utils/public-interface'
 import RemoteDialog from './part/remote-dialog.vue'
 import RemotePart from './part/remote-part.vue'
 import MessagePart from './part/message-part.vue'
-import {Session} from "@/utils/storage";
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
 const router = useRouter()
-const remoteStore = useRemoteStore()
-
 const remotePartRef = ref()
 const messagePartRef = ref()
 const remoteDialogRef = ref()
-const remoteTask = ref([] as Array<RemoteItem>)
+const remoteTask = ref([] as Array<any>)
+const remoteWsStore = useRemoteWsStore();
 
-initRemoteTask()
-
-function resetRemoteTaskItem(e: RemoteItem) {
-	Object.assign(remoteTask.value[e.index], {
-		isRemote: false,
-		dataAlarm: false,
-		title: '',
-		serverUser: '',
-		patientName: '',
-		patientCode: '',
-		index: e.index,
-	})
-}
+onMounted(() => {
+	initRemoteTask()
+})
 
 function initRemoteTask() {
-	remoteTask.value = remoteStore.remoteTasks
-	if (remoteTask.value.length < 1) {
-		while (remoteTask.value.length < 10) {
-			const obj = {
-				isRemote: false, // 连接状态
-				dataAlarm: false, // 异常状态
-				title: '',
-				serverUser: '', // 服务器用户名
-				patientName: '', // 病人名称
-				patientCode: '', // 病人身份证
-				index: remoteTask.value.length,
-				log: []
-			}
-			if (remoteTask.value.length < 3) {
-				obj.isRemote = true
-				obj.title = '远程控制' + (remoteTask.value.length + 1)
-				obj.serverUser = 'root'
-				obj.patientName = '测试' + (remoteTask.value.length + 1)
-			}
-			if (remoteTask.value.length == 1) obj.dataAlarm = true
-			remoteTask.value.push(obj)
-		}
-		remoteStore.setRemoteTasks(remoteTask.value)
-		if (!remoteStore.currentRemote.index) {
-			remoteStore.$patch({currentRemote: remoteTask.value[0]})
-		}
-	}
+	remoteTask.value = remoteWsStore.initRemoteTask()
 }
 
 const viewThumbnail = () => {
@@ -99,201 +54,41 @@ const viewThumbnail = () => {
 	})
 }
 // 打开任务连接弹窗
-const editTask = (item: RemoteItem, index: number) => {
-	item.index = index
+const editTask = (item: any) => {
 	// 如果当前任务是已连接状态则直接渲染content 否则打开弹窗
 	if (item.isRemote) {
-		confirmRemote(item)
+		remotePartRef.value.showData(item.index)
 	} else {
-		remoteDialogRef.value.open(item)
+		remoteDialogRef.value.open(item.index)
 	}
 }
 // 跳转到远程控制
-const toRemoteControl = (item: RemoteItem, index: number) => {
+const toRemoteControl = (item: any) => {
 	// 如果当前任务是已连接状态则跳转，否则打开弹窗
 	if (item.isRemote) {
 		router.push('/remote-manage/remote-control')
 	} else {
-		editTask(item, index)
+		remoteDialogRef.value.open(item.index)
 	}
 }
 // 连接成功
-const confirmRemote = (e: RemoteItem) => {
-	messagePartRef.value.setData({
-		time: new Date(),
-		title: e.title,
-		state: '连接成功'
-	}, e.index)
-	remoteTask.value[e.index] = e // 状态设置为可连接
-	remotePartRef.value.initData(e)
-	console.log(e);
-	getSurgeryData();
+const confirmRemote = () => {
+	messagePartRef.value.scrollToBottom()
+	// 状态设置为可连接
+	remotePartRef.value.initData()
 }
 // 连接失败
-const errorRemote = (e: RemoteItem) => {
-	messagePartRef.value.setData({
-		time: new Date(),
-		title: e.title,
-		state: '连接失败'
-	}, e.index)
+const errorRemote = () => {
+	messagePartRef.value.scrollToBottom()
 }
 // 断开连接
-const breakRemote = (e: RemoteItem) => {
-	resetRemoteTaskItem(e)
-	remotePartRef.value.initData()
-	messagePartRef.value.setData({
-		time: new Date(),
-		title: e.title,
-		state: '断开连接'
-	}, e.index)
-//	disconnectSurgeryData("", "1")
+const breakRemote = () => {
+	messagePartRef.value.scrollToBottom()
 }
 const addLogAfter = () => {
 	messagePartRef.value.scrollToBottom()
 }
 
-const ws = new WebSocket("ws://localhost:5173/socket.io/admin/rax/vitalSignsMedicine?token=" + Session.getToken());
-
-function getSurgeryData() {
-	const params = {
-		patientName: "1111111",
-		idNum: "123567890",
-		date: "20230505"
-	}
-	ws.send(JSON.stringify(params))
-}
-
-function disconnectSurgeryData() {
-	ws.close();
-}
-
-ws.onmessage = function (e) {
-	console.log(e)
-}
-
-const chatws = new WebSocket("ws://localhost:5173/socket.io/admin/rax/chatRoom?token=" + Session.getToken());
-
-function sendMsg() {
-	const params = {
-		patientName: "1111111",
-		idNum: "123567890",
-		date: "20230505",
-		msg: "测试消息"
-	}
-	chatws.send(JSON.stringify(params))
-}
-
-chatws.onmessage = function (e) {
-	console.log(e)
-}
-
-function closeChat() {
-	chatws.close()
-}
-
-const addMedicineWS = new WebSocket("ws://localhost:5173/socket.io/admin/rax/addMedicine?token=" + Session.getToken())
-
-function addMedicine() {
-	const params = {
-		patientName: "1111111",
-		idNum: "123567890",
-		date: "20230505",
-		flag: "2",
-		medicine: "丙泊酚",
-		value: "1"
-	}
-	addMedicineWS.send(JSON.stringify(params))
-}
-
-addMedicineWS.onmessage = function (e) {
-	console.log(e)
-}
-
-function closeAddMedicineWS() {
-	addMedicineWS.close()
-}
-
-/*const surgeryClient = new Client({
-  brokerURL: 'ws://localhost:5173/socket.io/admin/rax/SurgeryData',
-  connectHeaders: {
-    token: Session.get('token')
-  },
-  reconnectDelay: 5000,
-  heartbeatIncoming: 60000,
-  heartbeatOutgoing: 60000
-})
-surgeryClient.activate()
-
-surgeryClient.onConnect = (data: any) => {
-  console.log("connect", data);
-}
-
-surgeryClient.onWebSocketError = (error) => {
-  console.log('Error with websocket', error)
-};
-
-surgeryClient.onStompError = (frame) => {
-  console.log('Broker reported error: ' + frame.headers['message'])
-  console.log('Additional details: ' + frame.body)
-};
-
-function getSurgeryData(username: string, db: string) {
-  console.log(username, db);
-  surgeryClient.publish({
-    destination: "/front/getSurgeryData",
-    headers: {
-      token: Session.get('token')
-    },
-    body: JSON.stringify({status: "start", db})
-  });
-  const account = "admin";
-  surgeryClient.subscribe('/topic/user/' + account + ":" + db + '/surgeryData', (data: any) => {
-    console.log(data);
-  })
-}*/
-
-/*function disconnectSurgeryData(username: string, db: string) {
-  const account = "admin";
-  surgeryClient.unsubscribe("/topic/user/" + account + ":" + db + "/surgeryData");
-}
-
-const chatClient = new Client({
-  brokerURL: 'ws://localhost:5173/socket.io/admin/rax/chat',
-  connectHeaders: {
-    token: Session.get('token')
-  },
-  reconnectDelay: 5000,
-  heartbeatIncoming: 60000,
-  heartbeatOutgoing: 60000
-})
-chatClient.activate()
-
-const patientName = '111'
-const idNum = '111'
-const date = '20230505'
-
-function sendChatMessage() {
-  const message = {
-    patientName: patientName,
-    idNum: idNum,
-    date: date,
-    msg: '测试消息'
-  }
-  chatClient.publish({
-    destination: '/front/sendMessage',
-    headers: {
-      token: Session.get('token')
-    },
-    body: JSON.stringify(message)
-  })
-}*/
-
-/*chatClient.onConnect = () => {
-  chatClient.subscribe('/topic/user/' + patientName + idNum + date + '/chatroomMessage', (data: any) => {
-    console.log(data)
-  })
-}*/
-
 </script>
 
 <style lang='scss' scoped>
diff --git a/src/views/remote-manage/remote-thumbnail.vue b/src/views/remote-manage/remote-thumbnail.vue
index 0a8c052..ea93345 100644
--- a/src/views/remote-manage/remote-thumbnail.vue
+++ b/src/views/remote-manage/remote-thumbnail.vue
@@ -1,55 +1,53 @@
 <template>
-  <el-scrollbar style="width: 100%;height: 100%;">
-    <div class="remote-thumbnail-page">
-      <div class="remote-box row1">
-        <div class="remote-item" v-for="item in remoteTask.slice(0, 4)" :key="item.title" @click="openRemote(item)">
-          <RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index" @addLogAfter="addLogAfter"></RemoteItemPart>
-        </div>
-      </div>
-      <div class="remote-box row2">
-        <div class="left-box">
-          <div class="remote-item" v-for="item in remoteTask.slice(4)" :key="item.title" @click="openRemote(item)">
-            <RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index" @addLogAfter="addLogAfter"></RemoteItemPart>
-          </div>
-        </div>
-        <div class="right-box">
-          <div class="message-title">异常信息</div>
-          <div class="message-item" v-for="item in remoteTask" :key="'message-item' + item">
-            <MessageItemPart ref="messageItemPartRef" :logs="item.log" :index="item.index"></MessageItemPart>
-          </div>
-        </div>
-      </div>
-    </div>
-  </el-scrollbar>
+	<el-scrollbar style="width: 100%;height: 100%;">
+		<div class="remote-thumbnail-page">
+			<div class="remote-box row1">
+				<div class="remote-item" v-for="item in remoteTask.slice(0, 4)" :key="item.title" @click="openRemote(item)">
+					<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index"
+													@addLogAfter="addLogAfter"></RemoteItemPart>
+				</div>
+			</div>
+			<div class="remote-box row2">
+				<div class="left-box">
+					<div class="remote-item" v-for="item in remoteTask.slice(4)" :key="item.title" @click="openRemote(item)">
+						<RemoteItemPart :ref="'remoteItemPartRef' + item.index" :index="item.index"
+														@addLogAfter="addLogAfter"></RemoteItemPart>
+					</div>
+				</div>
+				<div class="right-box">
+					<div class="message-title">异常信息</div>
+					<div class="message-item" v-for="item in remoteTask" :key="'message-item' + item">
+						<MessageItemPart ref="messageItemPartRef" :index="item.index"></MessageItemPart>
+					</div>
+				</div>
+			</div>
+		</div>
+	</el-scrollbar>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useRemoteStore } from '@/stores/remote-info-store'
-import type { RemoteItem } from '@/utils/public-interface'
-import RemoteItemPart from './part/remote-item-part.vue'
-import MessageItemPart from './part/message-item-part.vue'
+import {onMounted, ref} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
+import RemoteItemPart from './part/remote-item-part.vue';
+import MessageItemPart from './part/message-item-part.vue';
+import {useRemoteWsStore} from "@/stores/remote-ws-store";
 
-const route = useRoute()
-const router = useRouter()
+const route = useRoute();
+const router = useRouter();
+const messageItemPartRef = ref();
+const remoteTask = ref([] as any);
+const remoteWsStore = useRemoteWsStore();
 
-const messageItemPartRef = ref()
-const remoteTask = ref([] as Array<RemoteItem>)
-
-remoteTask.value = useRemoteStore().getRemoteTasks()
-
-// 路由初始化后执行
-router.isReady().then(() => {
-  console.log(route)
+onMounted(() => {
+	console.log("remoteThumbnail", remoteWsStore.remoteTasks)
+	remoteTask.value = remoteWsStore.remoteTasks;
 })
 
-const openRemote = (params: RemoteItem) => {
-  useRemoteStore().setCurrentRemote(params)
-  router.push('/remote-manage/remote-manage')
+const openRemote = (params: any) => {
+	router.push('/remote-manage/remote-manage')
 }
 const addLogAfter = (index: number) => {
-  messageItemPartRef.value[index].scrollToBottom()
+	messageItemPartRef.value[index].scrollToBottom()
 }
 
 </script>

From e674cf8cd8cad96d70ecaafd0d90ee4e9a683c4b Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Tue, 23 Apr 2024 14:59:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8A=A0=E5=AF=86=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=92=8C=E8=A7=A3=E5=AF=86=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |   2 +-
 src/router/index.ts                          | 164 +++--
 src/utils/other.ts                           |  52 +-
 src/views/remote-manage/part/remote-part.vue | 707 ++++++++++---------
 src/views/remote-manage/remote-control.vue   |   2 +-
 src/views/remote-manage/remote-manage.vue    |   5 +-
 src/views/remote-manage/remote-thumbnail.vue |   3 +-
 7 files changed, 503 insertions(+), 432 deletions(-)

diff --git a/package.json b/package.json
index 2bb4d76..776823d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@stomp/stompjs": "^7.0.0",
     "axios": "^1.3.3",
-    "crypto-js": "4.2.0",
+    "crypto-js": "^4.2.0",
     "echarts": "^5.4.1",
     "element-plus": "2.3.1",
     "js-cookie": "^3.0.5",
diff --git a/src/router/index.ts b/src/router/index.ts
index 2ae2c50..e777a56 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,82 +1,100 @@
-import { createRouter, createWebHistory } from 'vue-router'
-import { useLoginStore } from '@/stores/user-info-store'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { constantRoute } from './routes'
+import {createRouter, createWebHistory} from 'vue-router'
+import {useLoginStore} from '@/stores/user-info-store'
+import {ElMessage} from 'element-plus'
+import {constantRoute} from './routes'
+import {decrypt, decryption, encrypt, encryption, isBase64} from "@/utils/other";
 
 const router = createRouter({
-    history: createWebHistory(import.meta.env.BASE_URL),
-    routes: constantRoute,
+	history: createWebHistory(import.meta.env.BASE_URL),
+	routes: constantRoute,
+	stringifyQuery: stringifyQuery,
+	parseQuery: parseQuery,
 })
 
+const kk = "raxipnenttlewe";
+
 router.beforeEach((to, from, next) => {
-    const loginInfo = useLoginStore().getlogin()
+	const loginInfo = useLoginStore().getlogin()
 //    const isLogin = loginInfo.isLogin
-    // 普通用户
-    const commonUser = [
-        '/login',
-        '/home',
-        '/patients-manage',
-        '/patients-manage/patients-manage',
-        '/patients-manage/surgery-info'
-    ]
-    // 中级管理员
-    const IntermediateAdmin = [
-        '/login',
-        '/home',
-        '/patients-manage',
-        '/patients-manage/patients-manage',
-        '/patients-manage/surgery-info',
-        '/remote-manage',
-        '/remote-manage/remote-manage',
-        '/remote-manage/remote-control'
-    ]
-    // 高级管理员
-    const SeniorAdmin = [
-        '/login',
-        '/home',
-        '/patients-manage',
-        '/patients-manage/patients-manage',
-        '/patients-manage/surgery-info',
-        '/remote-manage',
-        '/remote-manage/remote-manage',
-        '/remote-manage/remote-control',
-        '/permissions-manage',
-        '/permissions-manage/doctor-manage',
-        '/permissions-manage/role-manage',
-        '/permissions-manage/menu-manage',
-        '/logs-manage',
-        '/logs-manage/message-manage',
-        '/logs-manage/logs-manage'
-    ]
-    const isViewRoute = () => {
-        let release = true
-			/*switch (loginInfo.permissions) {
-				case '超级管理员':
-					release = true
-					break;
-				case '高级管理员':
-					release = SeniorAdmin.some((p: string) => p === to.path)
-					break;
-				case '中级管理员':
-					release = IntermediateAdmin.some((p: string) => p === to.path)
-					break;
-				case '普通用户':
-					release = commonUser.some((p: string) => p === to.path)
-					break;
-				default:
-					break;
-			}*/
-        return release
-    }
-    if(to.fullPath ==='/login') {
-        next()
-        return
-    }
-    /*if (!isLogin) next('/login') // 重定向登录页
-    else */if(!isViewRoute()) {
-        ElMessage.error('无权访问！')
-        next(from.fullPath)
-    }else next()
+	// 普通用户
+	const commonUser = [
+		'/login',
+		'/home',
+		'/patients-manage',
+		'/patients-manage/patients-manage',
+		'/patients-manage/surgery-info'
+	]
+	// 中级管理员
+	const IntermediateAdmin = [
+		'/login',
+		'/home',
+		'/patients-manage',
+		'/patients-manage/patients-manage',
+		'/patients-manage/surgery-info',
+		'/remote-manage',
+		'/remote-manage/remote-manage',
+		'/remote-manage/remote-control'
+	]
+	// 高级管理员
+	const SeniorAdmin = [
+		'/login',
+		'/home',
+		'/patients-manage',
+		'/patients-manage/patients-manage',
+		'/patients-manage/surgery-info',
+		'/remote-manage',
+		'/remote-manage/remote-manage',
+		'/remote-manage/remote-control',
+		'/permissions-manage',
+		'/permissions-manage/doctor-manage',
+		'/permissions-manage/role-manage',
+		'/permissions-manage/menu-manage',
+		'/logs-manage',
+		'/logs-manage/message-manage',
+		'/logs-manage/logs-manage'
+	]
+	const isViewRoute = () => {
+		let release = true
+		/*switch (loginInfo.permissions) {
+              case '超级管理员':
+                  release = true
+                  break;
+              case '高级管理员':
+                  release = SeniorAdmin.some((p: string) => p === to.path)
+                  break;
+              case '中级管理员':
+                  release = IntermediateAdmin.some((p: string) => p === to.path)
+                  break;
+              case '普通用户':
+                  release = commonUser.some((p: string) => p === to.path)
+                  break;
+              default:
+                  break;
+          }*/
+		return release
+	}
+	if (to.fullPath === '/login') {
+		next()
+		return
+	}
+	/*if (!isLogin) next('/login') // 重定向登录页
+  else */
+	if (!isViewRoute()) {
+		ElMessage.error('无权访问！')
+		next(from.fullPath)
+	} else next()
 });
 
+function stringifyQuery(query: any) {
+	return btoa(encrypt(JSON.stringify(query), kk));
+}
+
+function parseQuery(query: any) {
+	if (isBase64(query)) {
+		return JSON.parse(decrypt(atob(query), kk));
+	} else {
+		return query;
+	}
+}
+
 export default router
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 2022a28..0f48724 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -5,29 +5,47 @@ import * as CryptoJS from 'crypto-js';
  *加密处理
  */
 export function encryption(src: string, keyWord: string) {
-    const key = CryptoJS.enc.Utf8.parse(keyWord);
-    // 加密
-    let encrypted = CryptoJS.AES.encrypt(src, key, {
-        iv: key,
-        mode: CryptoJS.mode.CBC,
-        padding: CryptoJS.pad.Pkcs7,
-    });
-    return encrypted.toString();
+	const key = CryptoJS.enc.Utf8.parse(keyWord);
+	// 加密
+	const encrypted = CryptoJS.AES.encrypt(src, key, {
+		iv: key,
+		mode: CryptoJS.mode.CBC,
+		padding: CryptoJS.pad.Pkcs7,
+	});
+	return encrypted.toString();
 }
 
 /**
  *  解密
- * @param {*} params 参数列表
  * @returns 明文
+ * @param src
+ * @param keyWord
  */
 export function decryption(src: string, keyWord: string) {
-    const key = CryptoJS.enc.Utf8.parse(keyWord);
-    // 解密逻辑
-    let decryptd = CryptoJS.AES.decrypt(src, key, {
-        iv: key,
-        mode: CryptoJS.mode.CBC,
-        padding: CryptoJS.pad.Pkcs7,
-    });
+	const key = keyWord;
+	// 解密逻辑
+	const decryptd = CryptoJS.AES.decrypt(src, key, {
+		iv: key,
+		mode: CryptoJS.mode.CBC,
+		padding: CryptoJS.pad.Pkcs7,
+	});
 
-    return decryptd.toString(CryptoJS.enc.Utf8);
+	return decryptd.toString(CryptoJS.enc.Utf8);
+}
+
+export function encrypt(src: string, key: string) {
+	return CryptoJS.AES.encrypt(src, key).toString()
+}
+
+export function decrypt(src: string, key: string) {
+	return CryptoJS.AES.decrypt(src, key).toString(CryptoJS.enc.Utf8)
+}
+
+export function isBase64(s: string) {
+	if (s == "" || s.trim() == "") return false;
+	try {
+		return window.btoa(window.atob(s)) == s;
+	} catch (e) {
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue
index 014e5d0..f0201fd 100644
--- a/src/views/remote-manage/part/remote-part.vue
+++ b/src/views/remote-manage/part/remote-part.vue
@@ -1,119 +1,119 @@
 <template>
-  <div class="remote-part">
-    <div class="title">
-      <span>{{ remoteItem?.taskName || '远程控制' }}</span>
-      <el-button v-if="remoteItem?.taskName" class="break-btn" @click="breakRemote">断开连接</el-button>
-    </div>
-    <!-- 小分辨率 -->
-    <div v-if="mediaMini800" class="content mini" :class="{'is-total': remoteItem?.isRemote}">
-      <div class="left-box">
-        <div class="info-box">
-          <div class="row-item">
-            <span class="label">病人名称</span>
-            <span class="input-value">{{ remoteItem.patient }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">住院号</span>
-            <span class="input-value">{{ remoteItem.patientId }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">手术时间</span>
-            <span class="input-value">{{
-                remoteItem.date
-              }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">手术状态</span>
-            <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
-            <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
-          </div>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
-          <span class="label">BIS</span>
-          <span class="value">{{ patientInfo.BIS }}</span>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
-          <span class="label">SBP</span>
-          <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item">
-          <span class="label">SPO2</span>
-          <span class="value">{{ patientInfo.SPO2 }}</span>
-        </div>
-        <div class="row-item yellow" :class="{'alarm': patientInfo.DBP_except}">
-          <span class="label">DBP</span>
-          <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item yellow" :class="{'alarm': patientInfo.HR_except}">
-          <span class="label">HR</span>
-          <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
-        </div>
-        <div class="row-item yellow">
-          <span class="label">TEMP</span>
-          <span class="value">{{ patientInfo.TEMP }}</span>
-        </div>
-      </div>
-      <div class="center-box">
-        <img src="@/assets/imgs/main_body_intact.png">
-      </div>
-    </div>
-    <div v-else class="content" :class="{'is-total': remoteItem?.isRemote}">
-      <div class="left-box">
-        <div class="info-box">
-          <div class="row-item">
-            <span class="label">病人名称</span>
-            <span class="input-value">{{ remoteItem.patient }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">住院号</span>
-            <span class="input-value">{{ remoteItem.patientId }}</span>
-          </div>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
-          <span class="label">BIS</span>
-          <span class="value">{{ patientInfo.BIS }}</span>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
-          <span class="label">SBP</span>
-          <span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item">
-          <span class="label">SPO2</span>
-          <span class="value">{{ patientInfo.SPO2 }}</span>
-        </div>
-      </div>
-      <div class="center-box">
-        <img src="@/assets/imgs/main_body_intact.png">
-      </div>
-      <div class="right-box">
-        <div class="info-box">
-          <div class="row-item">
-            <span class="label">手术时间</span>
-            <span class="input-value">{{
-                remoteItem.date
-              }}</span>
-          </div>
-          <div class="row-item">
-            <span class="label">手术状态</span>
-            <span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
-            <span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
-          </div>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.DBP_except}">
-          <span class="label">DBP</span>
-          <span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
-        </div>
-        <div class="row-item" :class="{'alarm': patientInfo.HR_except}">
-          <span class="label">HR</span>
-          <span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
-        </div>
-        <div class="row-item">
-          <span class="label">TEMP</span>
-          <span class="value">{{ patientInfo.TEMP }}</span>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div class="remote-part">
+		<div class="title">
+			<span>{{ remoteItem?.taskName || '远程控制' }}</span>
+			<el-button v-if="remoteItem?.taskName" class="break-btn" @click="breakRemote">断开连接</el-button>
+		</div>
+		<!-- 小分辨率 -->
+		<div v-if="mediaMini800" class="content mini" :class="{'is-total': remoteItem?.isRemote}">
+			<div class="left-box">
+				<div class="info-box">
+					<div class="row-item">
+						<span class="label">病人名称</span>
+						<span class="input-value">{{ remoteItem.patient }}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">住院号</span>
+						<span class="input-value">{{ remoteItem.patientId }}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">手术时间</span>
+						<span class="input-value">{{
+								remoteItem.date
+							}}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">手术状态</span>
+						<span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
+						<span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
+					</div>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
+					<span class="label">BIS</span>
+					<span class="value">{{ patientInfo.BIS }}</span>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
+					<span class="label">SBP</span>
+					<span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item">
+					<span class="label">SPO2</span>
+					<span class="value">{{ patientInfo.SPO2 }}</span>
+				</div>
+				<div class="row-item yellow" :class="{'alarm': patientInfo.DBP_except}">
+					<span class="label">DBP</span>
+					<span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item yellow" :class="{'alarm': patientInfo.HR_except}">
+					<span class="label">HR</span>
+					<span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
+				</div>
+				<div class="row-item yellow">
+					<span class="label">TEMP</span>
+					<span class="value">{{ patientInfo.TEMP }}</span>
+				</div>
+			</div>
+			<div class="center-box">
+				<img src="@/assets/imgs/main_body_intact.png">
+			</div>
+		</div>
+		<div v-else class="content" :class="{'is-total': remoteItem?.isRemote}">
+			<div class="left-box">
+				<div class="info-box">
+					<div class="row-item">
+						<span class="label">病人名称</span>
+						<span class="input-value">{{ remoteItem.patient }}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">住院号</span>
+						<span class="input-value">{{ remoteItem.patientId }}</span>
+					</div>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.BIS_except}">
+					<span class="label">BIS</span>
+					<span class="value">{{ patientInfo.BIS }}</span>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.SBP_except}">
+					<span class="label">SBP</span>
+					<span class="value">{{ patientInfo.SBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item">
+					<span class="label">SPO2</span>
+					<span class="value">{{ patientInfo.SPO2 }}</span>
+				</div>
+			</div>
+			<div class="center-box">
+				<img src="@/assets/imgs/main_body_intact.png">
+			</div>
+			<div class="right-box">
+				<div class="info-box">
+					<div class="row-item">
+						<span class="label">手术时间</span>
+						<span class="input-value">{{
+								remoteItem.date
+							}}</span>
+					</div>
+					<div class="row-item">
+						<span class="label">手术状态</span>
+						<span class="tag-value" :class="{'normal': !patientInfo.state}">正常</span>
+						<span class="tag-value" :class="{'alarm': patientInfo.state}">异常</span>
+					</div>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.DBP_except}">
+					<span class="label">DBP</span>
+					<span class="value">{{ patientInfo.DBP }}<span class="unit">mmHg</span></span>
+				</div>
+				<div class="row-item" :class="{'alarm': patientInfo.HR_except}">
+					<span class="label">HR</span>
+					<span class="value">{{ patientInfo.HR }}<span class="unit">次/分</span></span>
+				</div>
+				<div class="row-item">
+					<span class="label">TEMP</span>
+					<span class="value">{{ patientInfo.TEMP }}</span>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang='ts' setup>
@@ -127,256 +127,289 @@ const patientInfo = ref({} as any)
 const remoteWsStore = useRemoteWsStore()
 
 defineExpose({
-  initData, showData
+	initData, showData
 });
 
 window.addEventListener('resize', () => {
-  mediaMini800.value = Boolean(window.innerWidth < 801)
+	mediaMini800.value = Boolean(window.innerWidth < 801)
 });
 
 onUnmounted(() => {
-  remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
+	remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
 })
 
 function showData(i: number) {
-  const lastTaskIndex = remoteWsStore.currentTaskIndex;
-  const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
-  if (lastTask) {
-    remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
-  }
-  remoteWsStore.currentTaskIndex = i
-  remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
-  getData()
+	const lastTaskIndex = remoteWsStore.currentTaskIndex;
+	const lastTask: any = remoteWsStore.remoteTasks[lastTaskIndex];
+	if (lastTask) {
+		remoteWsStore.unsubscribeVital(lastTask.patient, lastTask.patientId, lastTask.date);
+	}
+	remoteWsStore.currentTaskIndex = i
+	remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
+	getData()
 }
 
 function initData() {
-  remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
-  remoteWsStore.createConnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
-  getData()
+	remoteItem.value = remoteWsStore.remoteTasks[remoteWsStore.currentTaskIndex]
+	remoteWsStore.createConnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
+	getData()
 }
 
 function getData() {
 	remoteWsStore.unsubscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date);
-  remoteWsStore.subscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, (res: any) => {
-    const data = JSON.parse(res.data);
-    if (data.vitalSignsList && data.vitalSignsList.length > 0) {
-      Object.assign(patientInfo.value, data.vitalSignsList[0]);
-      patientInfo.value.state = (patientInfo.value.BIS_except || patientInfo.value.SBP_except ||
-        patientInfo.value.DBP_except || patientInfo.value.HR_except);
-      setLog(patientInfo.value)
-      emit('addLogAfter')
-    }
-  })
+	remoteWsStore.subscribeVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, (res: any) => {
+		if (res && res.data) {
+			const data = JSON.parse(res.data);
+			if (data.vitalSignsList && data.vitalSignsList.length > 0) {
+				Object.assign(patientInfo.value, data.vitalSignsList[0]);
+				patientInfo.value.state = (patientInfo.value.BIS_except || patientInfo.value.SBP_except ||
+					patientInfo.value.DBP_except || patientInfo.value.HR_except);
+				setLog(patientInfo.value)
+				emit('addLogAfter')
+			}
+		}
+	})
 }
 
 function setLog(data: any) {
-  remoteWsStore.exceptionType.forEach((item: any) => {
-    if (data[item]) {
-      const msg: any = remoteWsStore.exceptionMsg[item];
-      remoteWsStore.setRemoteLog({
-        state: msg,
-        taskName: remoteItem.value.taskName,
-        time: new Date(),
-        type: "exception"
-      }, remoteWsStore.currentTaskIndex);
-    }
-  })
+	remoteWsStore.exceptionType.forEach((item: any) => {
+		if (data[item]) {
+			const msg: any = remoteWsStore.exceptionMsg[item];
+			remoteWsStore.setRemoteLog({
+				state: msg,
+				taskName: remoteItem.value.taskName,
+				time: new Date(),
+				type: "exception"
+			}, remoteWsStore.currentTaskIndex);
+		}
+	})
 }
 
 const breakRemote = () => {
-  remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
-  remoteWsStore.resetRemoteTask(remoteWsStore.currentTaskIndex)
-  if (remoteWsStore.getActiveRemoteTask()) {
-    showData(remoteWsStore.getActiveRemoteTask())
-  }
-  emit('breakRemote')
+	remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date)
+	remoteWsStore.resetRemoteTask(remoteWsStore.currentTaskIndex)
+	if (remoteWsStore.getActiveRemoteTask()) {
+		showData(remoteWsStore.getActiveRemoteTask())
+	}
+	emit('breakRemote')
 }
 
 </script>
 
 <style lang='scss' scoped>
 .remote-part {
-    width: 100%;
-    height: 100%;
-    border: 1px solid $border-color;
+	width: 100%;
+	height: 100%;
+	border: 1px solid $border-color;
 
-    .title {
-        position: relative;
-        width: 100%;
-        height: 40px;
-        font-size: 20px;
-        text-align: center;
-        line-height: 40px;
-        font-weight: 600;
-        color: white;
-        background: $main-color;
-        .break-btn {
-            position: absolute;
-            top: 4px;
-            right: 20px;
-        }
-    }
-    .content {
-        width: 100%;
-        height: calc(100% - 40px);
-        padding: 20px 50px;
-        display: flex;
-        justify-content: space-between;
-        .common-box {
-            width: 30%;
-            height: 100%;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-evenly;
-            align-items: center;
-        }
-        .left-box {
-            @extend .common-box;
-            
-            .label {
-                background: $main-color;
-            }
-        }
-        .center-box {
-            @extend .common-box;
-            img {
-                max-width: 100%;
-                max-height: 100%;
-            }
-        }
-        .right-box {
-            @extend .common-box;
-            .label {
-              background: $main-color;
-            }
-        }
-        .row-item {
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-            .label {
-                flex-shrink: 0;
-                width: 100%;
-                height: 40px;
-                color: white;
-                font-size: 18px;
-                line-height: 40px;
-                text-align: center;
-                border-radius: 5px;
-            }
-        }
-        .info-box, .row-item .value {
-            display: none;
-        }
-        &.is-total {
-            .info-box, .row-item .value {
-                display: block;
-            }
-            .label {
-                width: calc(50% - 10px);
-            }
-            .value {
-                width: 50%;
-                height: 40px;
-                border-width: 1px;
-                border-style: solid;
-                text-align: center;
-                border-radius: 5px;
-                color: $main-color;
-                border-color: $main-color;
-                font-size: 22px;
-                line-height: 40px;
-                font-weight: 600;
-                .unit {
-                    font-size: 16px;
-                    font-family: 400;
-                }
-            }
-            .right-box .value {
-                color: $main-color;
-                border-color: $main-color;
-            }
-            .row-item.alarm {
-                .label {
-                    background: red !important;
-                }
-                .value {
-                    color: red !important;
-                    border-color: red !important;
-                }
-            }
-            .info-box {
-                width: 100%;
-                .row-item {
-                    padding: 10px 0;
-                    height: 40px;
-                    justify-content: flex-start;
-                    align-items: center;
-                    .label {
-                        width: 70px;
-                        height: 20px;
-                        background: transparent;
-                        color: $main-color;
-                        font-size: 16px;
-                        line-height: 20px;
-                        font-weight: 600;
-                        text-align: left;
-                    }
-                    .input-value {
-                        width: 100%;
-                        height: 21px;
-                        line-height: 20px;
-                        font-size: 16px;
-                        color: $main-color;
-                        border-bottom: 1px solid $border2-color;
-                    }
-                    .tag-value {
-                        margin-left: 30px;
-                        padding: 0 20px;
-                        height: 30px;
-                        line-height: 30px;
-                        font-size: 18px;
-                        color: white;
-                        font-weight: 600;
-                        background: $border2-color;
-                        border-radius: 8px;
-                        &.normal {
-                            background: $main-color;
-                        }
-                        &.alarm {
-                            background: red;
-                        }
-                    }
-                }
-            }
-        }
-        &.mini {
-            padding: 20px;
-            .left-box {
-                width: 240px;
-            }
-            .center-box {
-                width: calc(100% - 250px);
-            }
-            &.is-total {
-                .left-box {
-                    .info-box {
-                        display: block;
-                        flex-shrink: 0;
-                    }
-                    .row-item.yellow {
-                        .label {
-                            background: $main-color;
-                        }
-                        .value {
-                            color:$main-color;
-                            border-color: $main-color;
-                        }
-                    }
-                }
-            }
-            
-        }
-    }
+	.title {
+		position: relative;
+		width: 100%;
+		height: 40px;
+		font-size: 20px;
+		text-align: center;
+		line-height: 40px;
+		font-weight: 600;
+		color: white;
+		background: $main-color;
+
+		.break-btn {
+			position: absolute;
+			top: 4px;
+			right: 20px;
+		}
+	}
+
+	.content {
+		width: 100%;
+		height: calc(100% - 40px);
+		padding: 20px 50px;
+		display: flex;
+		justify-content: space-between;
+
+		.common-box {
+			width: 30%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+			align-items: center;
+		}
+
+		.left-box {
+			@extend .common-box;
+
+			.label {
+				background: $main-color;
+			}
+		}
+
+		.center-box {
+			@extend .common-box;
+
+			img {
+				max-width: 100%;
+				max-height: 100%;
+			}
+		}
+
+		.right-box {
+			@extend .common-box;
+
+			.label {
+				background: $main-color;
+			}
+		}
+
+		.row-item {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.label {
+				flex-shrink: 0;
+				width: 100%;
+				height: 40px;
+				color: white;
+				font-size: 18px;
+				line-height: 40px;
+				text-align: center;
+				border-radius: 5px;
+			}
+		}
+
+		.info-box, .row-item .value {
+			display: none;
+		}
+
+		&.is-total {
+			.info-box, .row-item .value {
+				display: block;
+			}
+
+			.label {
+				width: calc(50% - 10px);
+			}
+
+			.value {
+				width: 50%;
+				height: 40px;
+				border-width: 1px;
+				border-style: solid;
+				text-align: center;
+				border-radius: 5px;
+				color: $main-color;
+				border-color: $main-color;
+				font-size: 22px;
+				line-height: 40px;
+				font-weight: 600;
+
+				.unit {
+					font-size: 16px;
+					font-family: 400;
+				}
+			}
+
+			.right-box .value {
+				color: $main-color;
+				border-color: $main-color;
+			}
+
+			.row-item.alarm {
+				.label {
+					background: red !important;
+				}
+
+				.value {
+					color: red !important;
+					border-color: red !important;
+				}
+			}
+
+			.info-box {
+				width: 100%;
+
+				.row-item {
+					padding: 10px 0;
+					height: 40px;
+					justify-content: flex-start;
+					align-items: center;
+
+					.label {
+						width: 70px;
+						height: 20px;
+						background: transparent;
+						color: $main-color;
+						font-size: 16px;
+						line-height: 20px;
+						font-weight: 600;
+						text-align: left;
+					}
+
+					.input-value {
+						width: 100%;
+						height: 21px;
+						line-height: 20px;
+						font-size: 16px;
+						color: $main-color;
+						border-bottom: 1px solid $border2-color;
+					}
+
+					.tag-value {
+						margin-left: 30px;
+						padding: 0 20px;
+						height: 30px;
+						line-height: 30px;
+						font-size: 18px;
+						color: white;
+						font-weight: 600;
+						background: $border2-color;
+						border-radius: 8px;
+
+						&.normal {
+							background: $main-color;
+						}
+
+						&.alarm {
+							background: red;
+						}
+					}
+				}
+			}
+		}
+
+		&.mini {
+			padding: 20px;
+
+			.left-box {
+				width: 240px;
+			}
+
+			.center-box {
+				width: calc(100% - 250px);
+			}
+
+			&.is-total {
+				.left-box {
+					.info-box {
+						display: block;
+						flex-shrink: 0;
+					}
+
+					.row-item.yellow {
+						.label {
+							background: $main-color;
+						}
+
+						.value {
+							color: $main-color;
+							border-color: $main-color;
+						}
+					}
+				}
+			}
+
+		}
+	}
 }
 </style>
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index d02b8ae..a64a745 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -481,7 +481,7 @@ const viewPatientInfo = () => {
 	}, 0)
 }
 const backRemote = () => {
-	router.back()
+	router.back();
 }
 const playPause = () => {
 	if (liveVideo.value.paused) {
diff --git a/src/views/remote-manage/remote-manage.vue b/src/views/remote-manage/remote-manage.vue
index 8adaabe..c3dbc20 100644
--- a/src/views/remote-manage/remote-manage.vue
+++ b/src/views/remote-manage/remote-manage.vue
@@ -46,11 +46,14 @@ onMounted(() => {
 
 function initRemoteTask() {
 	remoteTask.value = remoteWsStore.initRemoteTask()
+	remotePartRef.value.showData(remoteWsStore.currentTaskIndex);
 }
 
 const viewThumbnail = () => {
 	router.push({
-		path: '/remote-manage/remote-thumbnail'
+		path: '/remote-manage/remote-thumbnail',
+		query: {
+		}
 	})
 }
 // 打开任务连接弹窗
diff --git a/src/views/remote-manage/remote-thumbnail.vue b/src/views/remote-manage/remote-thumbnail.vue
index ea93345..29c0db8 100644
--- a/src/views/remote-manage/remote-thumbnail.vue
+++ b/src/views/remote-manage/remote-thumbnail.vue
@@ -39,12 +39,11 @@ const remoteTask = ref([] as any);
 const remoteWsStore = useRemoteWsStore();
 
 onMounted(() => {
-	console.log("remoteThumbnail", remoteWsStore.remoteTasks)
 	remoteTask.value = remoteWsStore.remoteTasks;
 })
 
 const openRemote = (params: any) => {
-	router.push('/remote-manage/remote-manage')
+	router.push('/remote-manage/remote-manage');
 }
 const addLogAfter = (index: number) => {
 	messageItemPartRef.value[index].scrollToBottom()

From 7273a8550317a08e41dcecfd22441a801ab828ad Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Tue, 23 Apr 2024 18:31:46 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/daily-plan.ts            |  13 +
 src/api/patient.ts               |  12 +-
 src/utils/date-util.ts           |  96 +++---
 src/views/home/index.vue         | 350 +++++++++++----------
 src/views/home/record-form.vue   | 239 +++++++-------
 src/views/home/week-calendar.vue | 518 ++++++++++++++++---------------
 6 files changed, 650 insertions(+), 578 deletions(-)
 create mode 100644 src/api/daily-plan.ts

diff --git a/src/api/daily-plan.ts b/src/api/daily-plan.ts
new file mode 100644
index 0000000..c0a216d
--- /dev/null
+++ b/src/api/daily-plan.ts
@@ -0,0 +1,13 @@
+import request from "@/utils/request";
+
+const addDailyPlanUrl = "/admin/dailyPlan/addDailyPlan";
+
+export function addDailyPlan(param: any) {
+	return new Promise((resolve, reject) => {
+		request.postForm(addDailyPlanUrl, param).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	})
+}
\ No newline at end of file
diff --git a/src/api/patient.ts b/src/api/patient.ts
index 1adaa35..2913f63 100644
--- a/src/api/patient.ts
+++ b/src/api/patient.ts
@@ -8,10 +8,10 @@ export function getPatientInfo(name: string, id: string, date: string) {
 			patientName: name,
 			idNum: id,
 			date: date
-		})
-	}).then((res: any) => {
-		console.log(res.data)
-	}).catch(error => {
-		reject(error)
-	})
+		}).then((res: any) => {
+			resolve(res.data);
+		}).catch(error => {
+			reject(error);
+		});
+	});
 }
\ No newline at end of file
diff --git a/src/utils/date-util.ts b/src/utils/date-util.ts
index bcf51e1..666f5ec 100644
--- a/src/utils/date-util.ts
+++ b/src/utils/date-util.ts
@@ -22,55 +22,68 @@ export function dateFormater(formater: string, time?: any) {
 
 /**
  * 获取指定月份天数
- * @param {*} time 
- * @returns 
+ * @param {*} time
+ * @returns
  */
 export function getMonthDays(time: any) {
-    if (!time) time = new Date();
-    const now = new Date(time);
-    const year = now.getFullYear();
-    const month = now.getMonth() + 1;
+	if (!time) time = new Date();
+	const now = new Date(time);
+	const year = now.getFullYear();
+	const month = now.getMonth() + 1;
 
-    const isLeapYear = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+	const isLeapYear = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
 
-    const daysInMonth = month === 2
-        ? isLeapYear ? 29 : 28
-        : month === 4 || month === 6 || month === 9 || month === 11
-            ? 30
-            : 31;
+	const daysInMonth = month === 2
+		? isLeapYear ? 29 : 28
+		: month === 4 || month === 6 || month === 9 || month === 11
+			? 30
+			: 31;
 
-    return daysInMonth;
+	return daysInMonth;
 }
 
 /**
  * 获取当前日期的周几  i:1,2,3,4,5,6,7
  * @returns
  */
-export function getFirstDayOfWeek(date: Date, i: number) {
-    if (i < 1 || i > 7) {
-        return null;
-    }
-    const day = date.getDay() || 7;
-    return new Date(date.getFullYear(), date.getMonth(), date.getDate() + i - day);
+export function getFirstDayOfWeek(date: string | Date | number, i: number) {
+	let temp: any;
+	if (!(date instanceof Date)) {
+		if (typeof date == "number") {
+			temp = new Date(date);
+		} else {
+			const s = date.replace(/-/g, "/");
+			temp = new Date(s);
+		}
+	} else {
+		temp = new Date(date.getTime())
+	}
+	if (i < 1 || i > 7) {
+		return null;
+	}
+	const day = temp.getDay() || 7;
+	return new Date(temp.getFullYear(), temp.getMonth(), temp.getDate() + i - day);
 }
+
 /**
  * 获取当前日期是周几
  * @returns
  */
 const weekArray = ['周天', '周一', '周二', '周三', '周四', '周五', '周六'];
-export function getCurrentDate(date: any) {
-    let myDate = new Date();
-    if (date) {
-        if (date instanceof Date) {
-            myDate = date;
-        } else {
-            date = date.replace(/-/g, '/');
-            myDate = new Date(date);
-        }
-    }
 
-    const days = myDate.getDay();
-    return weekArray[days];
+export function getCurrentDate(date: any) {
+	let myDate = new Date();
+	if (date) {
+		if (date instanceof Date) {
+			myDate = date;
+		} else {
+			date = date.replace(/-/g, '/');
+			myDate = new Date(date);
+		}
+	}
+
+	const days = myDate.getDay();
+	return weekArray[days];
 }
 
 /**
@@ -78,17 +91,20 @@ export function getCurrentDate(date: any) {
  * @returns
  */
 export function getDays(date: any, days: number) {
-    if (date) {
-        if (!(date instanceof Date)) {
-            date = date.replace(/-/g, '/');
-            date = new Date(date);
-        }
+	if (date) {
+		let temp: any;
+		if (!(date instanceof Date)) {
+			date = date.replace(/-/g, '/');
+			temp = new Date(date);
+		} else {
+			temp = new Date(date.getTime());
+		}
 
-        const time = date.setDate(date.getDate() + days); // 天数
-        return new Date(time);
-    }
+		const time = temp.setDate(temp.getDate() + days);
+		return new Date(time);
+	}
 }
 
 export function getEndOfMonth(year: number, month: number) {
-    return new Date(year, month, 0).getDate()
+	return new Date(year, month, 0).getDate()
 }
\ No newline at end of file
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 400e49b..56283d7 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,66 +1,67 @@
 <template>
-    <div class="home-page">
-        <div class="background-box">
-            <div class="left-content">
-                <div class="message-box">
-                    <el-carousel height="32px" direction="vertical" indicator-position="none" autoplay>
-                        <el-carousel-item v-for="(item, index) in messages" :key="'message-' + index">
-                            <p class="text-row-1" style="line-height: 32px;" :class="{'is-link': item.link}" @click="() => {item.link && router.push(item.link)}">【{{ item.type }}】 {{ item.content }}</p>
-                        </el-carousel-item>
-                    </el-carousel>
-                </div>
-                <div class="header-box">
-                    <div class="header-item">
-                        <span class="main-color f20" style="font-weight: 600;">{{ userInfo.name }}</span>
-                        <span class="text2-color f14">{{ userInfo.permissions }}</span>
-                    </div>
-                    <div class="header-item">
-                        <el-icon class="text1-color" style="font-size: 26px;margin-right: 20px;">
-                            <Calendar />
-                        </el-icon>
-                        <div>
-                            <p class="text1-color f14">待办任务</p>
-                            <p class="main-color f20">{{ total }}</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="echart-box">
-                    <div class="echart-item">
-                        <NumberChart />
-                    </div>
-                    <div class="echart-item">
-                        <NumberPieChart />
-                    </div>
-                    <div class="echart-item">
-                        <TimeChart />
-                    </div>
-                    <div class="echart-item">
-                        <TimeBarChart />
-                    </div>
-                </div>
-            </div>
-            <div class="right-content">
-                <div class="week-calendar">
-                    <WeekCalendar />
-                </div>
-                <div class="system-logs">
-                    <div class="title">
-                        <span>系统日志</span>
-                        <span class="f14" style="cursor: pointer;" @click="router.push('./logs-manage/logs-manage')">更多</span>
-                    </div>
-                    <div class="content">
-                        <SystemLogs />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+	<div class="home-page">
+		<div class="background-box">
+			<div class="left-content">
+				<div class="message-box">
+					<el-carousel height="32px" direction="vertical" indicator-position="none" autoplay>
+						<el-carousel-item v-for="(item, index) in messages" :key="'message-' + index">
+							<p class="text-row-1" style="line-height: 32px;" :class="{'is-link': item.link}"
+								 @click="() => {item.link && router.push(item.link)}">【{{ item.type }}】 {{ item.content }}</p>
+						</el-carousel-item>
+					</el-carousel>
+				</div>
+				<div class="header-box">
+					<div class="header-item">
+						<span class="main-color f20" style="font-weight: 600;">{{ userInfo.name }}</span>
+						<span class="text2-color f14">{{ userInfo.permissions }}</span>
+					</div>
+					<div class="header-item">
+						<el-icon class="text1-color" style="font-size: 26px;margin-right: 20px;">
+							<Calendar/>
+						</el-icon>
+						<div>
+							<p class="text1-color f14">待办任务</p>
+							<p class="main-color f20">{{ total }}</p>
+						</div>
+					</div>
+				</div>
+				<div class="echart-box">
+					<div class="echart-item">
+						<NumberChart/>
+					</div>
+					<div class="echart-item">
+						<NumberPieChart/>
+					</div>
+					<div class="echart-item">
+						<TimeChart/>
+					</div>
+					<div class="echart-item">
+						<TimeBarChart/>
+					</div>
+				</div>
+			</div>
+			<div class="right-content">
+				<div class="week-calendar">
+					<WeekCalendar/>
+				</div>
+				<div class="system-logs">
+					<div class="title">
+						<span>系统日志</span>
+						<span class="f14" style="cursor: pointer;" @click="router.push('./logs-manage/logs-manage')">更多</span>
+					</div>
+					<div class="content">
+						<SystemLogs/>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import { useLoginStore } from '@/stores/user-info-store'
+import {onMounted, reactive, ref, toRefs, watch} from 'vue'
+import {useRouter} from 'vue-router'
+import {useLoginStore} from '@/stores/user-info-store'
 import NumberChart from "./number-chart.vue";
 import NumberPieChart from "./number-pie-chart.vue";
 import TimeChart from "./time-chart.vue";
@@ -75,127 +76,140 @@ const userInfo = useLoginStore().getlogin()
 const messages = ref([] as any)
 const total = ref(0) // 日历添加的记录提醒统计
 
-messages.value.push({type: '通知', content: '测试测试测试测试测试测试测试测试测试测试', link: '/system-manage/system-home'})
-messages.value.push({type: '公告', content: '公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试'})
+messages.value.push({
+	type: '通知',
+	content: '测试测试测试测试测试测试测试测试测试测试',
+	link: '/system-manage/system-home'
+})
+messages.value.push({
+	type: '公告',
+	content: '公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试'
+})
 </script>
 
 <style lang='scss' scoped>
 .home-page {
-    width: 100%;
-    height: 100%;
-    padding: 15px;
-    overflow-y: auto;
+	width: 100%;
+	height: 100%;
+	padding: 15px;
+	overflow-y: auto;
 
-    .background-box {
-        width: 100%;
-        height: 100%;
-        background: white;
-        padding: 20px 35px;
-        display: flex;
-        justify-content: space-between;
-        min-height: 900px;
+	.background-box {
+		width: 100%;
+		height: 100%;
+		background: white;
+		padding: 20px 35px;
+		display: flex;
+		justify-content: space-between;
+		min-height: 900px;
 
-    }
+	}
 
-    .left-content {
-        width: calc(100% - 350px);
-        height: 100%;
-        .message-box {
-            height: 34px;
-            background: #f8f8f8;
-            color: $text-color;
-            padding: 0 30px;
-            border: 1px solid $border1-color;
-            margin-bottom: 20px;
-            .is-link {
-                cursor: pointer;
-                color: $main-color;
-            }
-        }
-        .header-box {
-            width: 100%;
-            height: 90px;
-            display: flex;
-            justify-content: space-between;
+	.left-content {
+		width: calc(100% - 350px);
+		height: 100%;
 
-            .header-item {
-                width: calc(60% - 20px);
-                height: 100%;
-                border: 1px solid $border-color;
-                border-radius: 5px;
-                box-shadow: 1px 1px 5px $border2-color;
-                padding: 0 90px;
-                line-height: 1.5;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
+		.message-box {
+			height: 34px;
+			background: #f8f8f8;
+			color: $text-color;
+			padding: 0 30px;
+			border: 1px solid $border1-color;
+			margin-bottom: 20px;
 
-                &~.header-item {
-                    width: 40%;
-                    flex-direction: row;
-                    justify-content: flex-start;
-                    align-items: center;
-                }
-            }
-        }
+			.is-link {
+				cursor: pointer;
+				color: $main-color;
+			}
+		}
 
-        .echart-box {
-            width: 100%;
-            height: calc(100% - 164px);
-            margin-top: 20px;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
+		.header-box {
+			width: 100%;
+			height: 90px;
+			display: flex;
+			justify-content: space-between;
 
-            .echart-item {
-                width: calc(60% - 20px);
-                height: calc(50% - 10px);
-                border: 1px solid $border-color;
-                border-radius: 5px;
-                padding: 20px;
-                box-shadow: 1px 1px 5px $border2-color;
-                
-                &:nth-child(even) {
-                    width: 40%;
-                }
-                &:nth-child(n + 3) {
-                    margin-top: 20px;
-                }
-            }
-        }
-    }
+			.header-item {
+				width: calc(60% - 20px);
+				height: 100%;
+				border: 1px solid $border-color;
+				border-radius: 5px;
+				box-shadow: 1px 1px 5px $border2-color;
+				padding: 0 90px;
+				line-height: 1.5;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
 
-    .right-content {
-        width: 330px;
-        height: 100%;
-        .week-calendar {
-            width: 100%;
-            height: 50%;
-        }
-        .system-logs {
-            width: 100%;
-            height: calc(50% - 20px);
-            margin-top: 20px;
-            overflow: hidden;
+				& ~ .header-item {
+					width: 40%;
+					flex-direction: row;
+					justify-content: flex-start;
+					align-items: center;
+				}
+			}
+		}
 
-            .title {
-                width: 100%;
-                height: 40px;
-                padding: 0 20px;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-            }
+		.echart-box {
+			width: 100%;
+			height: calc(100% - 164px);
+			margin-top: 20px;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
 
-            .content {
-                width: 100%;
-                height: calc(100% - 50px);
-                margin-top: 10px;
-                border: 1px solid $border-color;
-                padding: 30px;
-                overflow-x: hidden;
-                overflow-y: auto;
-            }
-        }
-    }
+			.echart-item {
+				width: calc(60% - 20px);
+				height: calc(50% - 10px);
+				border: 1px solid $border-color;
+				border-radius: 5px;
+				padding: 20px;
+				box-shadow: 1px 1px 5px $border2-color;
+
+				&:nth-child(even) {
+					width: 40%;
+				}
+
+				&:nth-child(n + 3) {
+					margin-top: 20px;
+				}
+			}
+		}
+	}
+
+	.right-content {
+		width: 330px;
+		height: 100%;
+
+		.week-calendar {
+			width: 100%;
+			height: 50%;
+		}
+
+		.system-logs {
+			width: 100%;
+			height: calc(50% - 20px);
+			margin-top: 20px;
+			overflow: hidden;
+
+			.title {
+				width: 100%;
+				height: 40px;
+				padding: 0 20px;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			.content {
+				width: 100%;
+				height: calc(100% - 50px);
+				margin-top: 10px;
+				border: 1px solid $border-color;
+				padding: 30px;
+				overflow-x: hidden;
+				overflow-y: auto;
+			}
+		}
+	}
 }</style>
diff --git a/src/views/home/record-form.vue b/src/views/home/record-form.vue
index 60a963a..7a4f508 100644
--- a/src/views/home/record-form.vue
+++ b/src/views/home/record-form.vue
@@ -1,146 +1,147 @@
 <template>
-    <el-form ref="formRef" :model="formData" :rules="rules" label-width="100">
-        <el-form-item label="标题" prop="title">
-            <el-input v-model="formData.title" placeholder="请输入标题"></el-input>
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-            <el-select v-model="formData.type" placeholder="请选择类型">
-                <el-option v-for="item in typeOption" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="state" placeholder="请选择状态">
-            <el-select v-model="formData.state">
-                <el-option v-for="item in stateOption" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-        </el-form-item>
-        <el-row>
-            <el-col :span="12">
-                <el-form-item label="日期" prop="date">
-                    <el-date-picker v-model="formData.date" type="date" placeholder="请输入日期" />
-                </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                <el-form-item label="时间" prop="time">
-                    <el-time-picker v-model="formData.time" placeholder="请输入时间" />
-                </el-form-item>
-            </el-col>
-        </el-row>
-        <el-form-item label="内容" prop="content">
-            <el-input v-model="formData.content" type="textarea" :rows="10" placeholder="请输入内容"></el-input>
-        </el-form-item>
-        <div style="text-align: right;" >
-            <el-button v-if="formData.isSaveBtn" class="f18" type="primary" @click="saveData">保存</el-button>
-            <el-button v-if="formData.isRemoveBtn" class="f18" @click="removeData">删除</el-button>
-        </div>
-    </el-form>
+	<el-form ref="formRef" :model="formData" :rules="rules" label-width="100">
+		<el-form-item label="标题" prop="title">
+			<el-input v-model="formData.title" placeholder="请输入标题"></el-input>
+		</el-form-item>
+		<el-form-item label="类型" prop="type">
+			<el-select v-model="formData.type" placeholder="请选择类型">
+				<el-option v-for="item in typeOption" :key="item.value" :label="item.label" :value="item.value"/>
+			</el-select>
+		</el-form-item>
+		<el-form-item label="状态" prop="status" placeholder="请选择状态">
+			<el-select v-model="formData.status">
+				<el-option v-for="item in stateOption" :key="item.value" :label="item.label" :value="item.value"/>
+			</el-select>
+		</el-form-item>
+		<el-row>
+			<el-col :span="12">
+				<el-form-item label="日期" prop="date">
+					<el-date-picker v-model="formData.date" type="date" placeholder="请输入日期"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="时间" prop="time">
+					<el-time-picker v-model="formData.time" placeholder="请输入时间"/>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="内容" prop="content">
+			<el-input v-model="formData.content" type="textarea" :rows="10" placeholder="请输入内容"></el-input>
+		</el-form-item>
+		<div style="text-align: right;">
+			<el-button v-if="isSaveBtn" class="f18" type="primary" @click="saveData">保存</el-button>
+			<el-button v-if="isRemoveBtn" class="f18" @click="removeData">删除</el-button>
+		</div>
+	</el-form>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import {onMounted, reactive, ref} from 'vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {dateFormater} from "@/utils/date-util";
 
 const emit = defineEmits(['close', 'saveData'])
-
 const typeOption = [
-    { label: '手术', value: '手术' },
-    { label: '会议', value: '会议' },
+	{label: '手术', value: '手术'},
+	{label: '会议', value: '会议'},
 ]
 const stateOption = [
-    { label: '已处理', value: '已处理' },
-    { label: '未处理', value: '未处理' },
+	{label: '已处理', value: '已处理'},
+	{label: '未处理', value: '未处理'},
 ]
 const rules = reactive({
-    title: [
-        { required: true, message: '请输入标题', trigger: 'blur' },
-    ],
-    type: [
-        { required: true, message: '请选择类型', trigger: 'blur' },
-    ],
-    state: [
-        { required: true, message: '请选择状态', trigger: 'blur' },
-    ],
-    date: [
-        { required: true, message: '请输入日期', trigger: 'blur' },
-    ],
-    time: [
-        { required: true, message: '请输入时间', trigger: 'blur' },
-    ],
-    content: [
-        { required: true, message: '请输入内容', trigger: 'blur' },
-    ]
+	title: [
+		{required: true, message: '请输入标题', trigger: 'blur'},
+	],
+	type: [
+		{required: true, message: '请选择类型', trigger: 'blur'},
+	],
+	status: [
+		{required: true, message: '请选择状态', trigger: 'blur'},
+	],
+	date: [
+		{required: true, message: '请输入日期', trigger: 'blur'},
+	],
+	time: [
+		{required: true, message: '请输入时间', trigger: 'blur'},
+	],
+	content: [
+		{required: true, message: '请输入内容', trigger: 'blur'},
+	]
 })
-
 const formRef = ref()
 const formData = ref({
-    id: '',
-    title: '',
-    type: '',
-    state: '',
-    date: '',
-    time: '',
-    content: '',
-    isSaveBtn: true,
-    isRemoveBtn: true
+	id: '',
+	title: '',
+	type: '',
+	status: '',
+	date: '',
+	time: '',
+	content: '',
+})
+const isSaveBtn = ref(true);
+const isRemoveBtn = ref(true);
+defineExpose({
+	resetData
 })
-
 
 onMounted(() => {
-    formData.value = {
-        id: '',
-        title: '',
-        type: '',
-        state: '',
-        date: '',
-        time: '',
-        content: '',
-        isSaveBtn: true,
-        isRemoveBtn: true
-    }
+	formData.value = {
+		id: '',
+		title: '',
+		type: '',
+		status: '',
+		date: '',
+		time: '',
+		content: '',
+	}
 })
 
-defineExpose({
-    formData,
-    resetData,
-})
 function close() {
-    emit('close')
+	emit('close')
 }
-function resetData() {
-    formRef.value.resetFields()
-    Object.assign(formData.value, {
-        id: '',
-        title: '',  
-        type: '',
-        state: '',
-        date: '',
-        time: '',
-        content: ''
-    })
+
+function resetData(hasRmBtn: boolean, date?: string) {
+	formRef.value.resetFields()
+	Object.assign(formData.value, {
+		id: '',
+		title: '',
+		type: '',
+		status: '',
+		date: date ? date : '',
+		time: '',
+		content: ''
+	})
+	isRemoveBtn.value = hasRmBtn;
 }
-const saveData = async () => {
-    await formRef.value.validate((valid: any, fields: any) => {
-        if (valid) {
-            ElMessage.success('保存成功！')
-            emit('saveData', formData.value)
-            close()
-        } else {
-            // console.log('error submit!', fields)
-        }
-    })
+
+const saveData = () => {
+	formRef.value.validate((valid: any, fields: any) => {
+		if (valid) {
+			ElMessage.success('保存成功！');
+			const form = JSON.parse(JSON.stringify(formData.value));
+			form.time = dateFormater("HH:mm:ss", new Date(form.time));
+			emit('saveData', form);
+			close();
+		} else {
+			// console.log('error submit!', fields)
+		}
+	})
 }
 const removeData = () => {
-    ElMessageBox.confirm(
-        '是否确认删除？',
-        {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            draggable: true
-        }
-    ).then(() => {
-        ElMessage.success('删除成功！')
-        close()
-    }).catch(() => { })
+	ElMessageBox.confirm(
+		'是否确认删除？',
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+			draggable: true
+		}
+	).then(() => {
+		ElMessage.success('删除成功！')
+		close()
+	}).catch(() => {
+	})
 }
 </script>
 
diff --git a/src/views/home/week-calendar.vue b/src/views/home/week-calendar.vue
index 50bb104..3369b91 100644
--- a/src/views/home/week-calendar.vue
+++ b/src/views/home/week-calendar.vue
@@ -1,304 +1,332 @@
 <template>
-    <div class="week-calendar-part">
-        <div class="header-box">
-            <el-icon @click="setWeek('up')">
-                <ArrowLeft />
-            </el-icon>
-            <div class="date-block">
-                <span @click="handleOpen">{{ formatDate(month) }}</span>
-                <el-date-picker ref="datePicker" popper-class="week-calendar-picker" class="month-date-pick" v-model="month"
-                    type="month" @change="setWeek()" />
-            </div>
-            <el-icon @click="setWeek('down')">
-                <ArrowRight />
-            </el-icon>
-        </div>
-        <div class="week-box">
-            <table>
-                <tr class="text1-color">
-                    <th v-for="item in weekEn" :key="item">{{ item }}</th>
-                </tr>
-                <tr v-if="week.length > 0" class="">
-                    <td v-for="item in week" :key="item" :class="{
+	<div class="week-calendar-part">
+		<div class="header-box">
+			<el-icon @click="minusWeek()">
+				<ArrowLeft/>
+			</el-icon>
+			<div class="date-block">
+				<span @click="handleDatePickerOpen">{{ getMonthTitle() }}</span>
+				<el-date-picker ref="datePickerRef"
+												popper-class="week-calendar-picker"
+												class="month-date-pick"
+												v-model="month"
+												type="month"
+												@change="setMonthWeek()"/>
+			</div>
+			<el-icon @click="addWeek()">
+				<ArrowRight/>
+			</el-icon>
+		</div>
+		<div class="week-box">
+			<table>
+				<tr class="text1-color">
+					<th v-for="item in weekCn" :key="item">{{ item }}</th>
+				</tr>
+				<tr v-if="week.length > 0" class="">
+					<td v-for="item in week" :key="item" :class="{
                         'record-mark': recordWeek.some((r: any) => dateFormater('yyyy-MM-dd', r.date) === dateFormater('yyyy-MM-dd', item)),
                         'active': dateFormater('yyyy-MM-dd', item) === dateFormater('yyyy-MM-dd', currentDate)
                     }">
                         <span :class="{
                             'text2-color': item.getDate() > week[6].getDate()
                         }" @click="setDate(item)">{{ dateFormater('dd', item) }}</span>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <el-button text icon="Plus" style="width: 100%;margin-bottom: 5px;" @click="addRecord()">新建</el-button>
-        <div class="record-box ">
-            <el-empty v-if="record.length < 1" :description="dateFormater('MM月dd日', currentDate) + '没有任何记录'" style="padding: 0;" />
-            <div class="record-item" v-for="(item, index) in record" :key="'record-' + index" @click="viewRecord(item)">
-                <div class="icon-box">
-                    <i class="icon-RectangleCopy"></i>
-                </div>
-                <div class="text-box">
-                    <p class="main-color" style="font-weight: 600;cursor: pointer;">{{
-                        item.title }}</p>
-                    <p p class=" text2-color font14">{{ dateFormater('yyyy-MM-dd HH:mm:ss', item.time) }}</p>
-                </div>
-                <el-icon class="remove-icon" @click.stop="remoteRecord(item, index)">
-                    <Close />
-                </el-icon>
-            </div>
-        </div>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<el-button text icon="Plus" style="width: 100%;margin-bottom: 5px;" @click="addRecord()">新建</el-button>
+		<div class="record-box ">
+			<el-empty v-if="record.length < 1" :description="dateFormater('MM月dd日', currentDate) + '没有任何记录'"
+								style="padding: 0;"/>
+			<div class="record-item" v-for="(item, index) in record" :key="'record-' + index" @click="viewRecord(item)">
+				<div class="icon-box">
+					<i class="icon-RectangleCopy"></i>
+				</div>
+				<div class="text-box">
+					<p class="main-color" style="font-weight: 600;cursor: pointer;">{{
+							item.title
+						}}</p>
+					<p p class=" text2-color font14">{{ dateFormater('yyyy-MM-dd HH:mm:ss', item.time) }}</p>
+				</div>
+				<el-icon class="remove-icon" @click.stop="remoteRecord(item, index)">
+					<Close/>
+				</el-icon>
+			</div>
+		</div>
 
-        <el-dialog v-model="isRecordDialog" title="详情">
-            <RecordForm ref="recordFormRef" @close="isRecordDialog = false" @saveData="saveData" />
-        </el-dialog>
-    </div>
+		<el-dialog v-model="isRecordDialog" title="详情">
+			<RecordForm ref="recordFormRef" @close="isRecordDialog = false" @saveData="saveData"/>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
+import {onMounted, ref} from 'vue'
 import RecordForm from './record-form.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { dateFormater, getFirstDayOfWeek, getDays } from '@/utils/date-util'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {dateFormater, getDays, getFirstDayOfWeek} from '@/utils/date-util'
 
+const monthCn = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'];
+const weekCn = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+const datePickerRef = ref();
+const recordFormRef = ref();
+const isRecordDialog = ref(false);
+const month = ref(new Date());
+const week = ref([] as any);
+const recordWeek = ref([] as any);
+const record = ref([] as any);
+const currentDate = ref<Date>(new Date());
 
-const monthEn = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二']
-const weekEn = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+onMounted(init)
 
-const datePicker = ref()
-const recordFormRef = ref()
-const isRecordDialog = ref(false)
-const month = ref(new Date())
-const week = ref([] as any)
-const recordWeek = ref([] as any)
-const record = ref([] as any)
-const currentDate = ref<Date>(new Date())
-
-setWeek()
-
-function formatDate(date: any) {
-    return monthEn[new Date(date).getMonth()] + '月 ' + new Date(date).getFullYear()
+function init() {
+	setMonthWeek();
 }
+
+function getMonthTitle() {
+	return monthCn[new Date(month.value).getMonth()] + '月 ' + new Date(month.value).getFullYear();
+}
+
+function addWeek() {
+	const date: any = getDays(month.value, 7);
+	month.value = date;
+	setWeek(date);
+}
+
+function minusWeek() {
+	const date: any = getDays(month.value, -7);
+	month.value = date;
+	setWeek(date);
+}
+
+function setMonthWeek() {
+	setWeek(month.value);
+	setDate(month.value);
+}
+
 /**
  * 设置周
- * @param type 
+ * @param type
  * 获取一周的数据，然后给每天打 record-mark 标记
  */
-function setWeek(type?: 'up' | 'down') {
-    const date = (type && getDays(month.value, type === 'up' ? -7 : 7)) || month.value
-    currentDate.value = date
-    const e = date
-    week.value = []
-    recordWeek.value = []
-    recordWeek.value = [
-        {
-            id: '1',
-            title: '月度会议',
-            type: '',
-            state: '',
-            date: getFirstDayOfWeek(e, 1),
-            time: getFirstDayOfWeek(e, 1),
-            content: '测试测试'
-        },
-        {
-            id: '2',
-            title: '手术提醒',
-            type: '',
-            state: '',
-            date: getFirstDayOfWeek(e, 4),
-            time: getFirstDayOfWeek(e, 4),
-            content: '测试测试'
-        }
-    ]
-    // 定时器等待动画执行
-    setTimeout(() => {
-        for (let i = 0; i < 7; i++) {
-            week.value.push(getFirstDayOfWeek(date, i + 1))
-        }
-    }, 0)
-    setDate(currentDate.value)
+function setWeek(date: any) {
+	getWeekPlanList();
+
+	week.value = [];
+	setTimeout(() => {
+		for (let i = 0; i < 7; i++) {
+			week.value.push(getFirstDayOfWeek(date, i + 1));
+		}
+	}, 0)
 }
 
-const handleOpen = () => {
-    datePicker.value.handleOpen()
+function getWeekPlanList() {
+	recordWeek.value = []
+	/*recordWeek.value = [
+		{
+			id: '1',
+			title: '月度会议',
+			type: '',
+			state: '',
+			date: getFirstDayOfWeek(e, 1),
+			time: getFirstDayOfWeek(e, 1),
+			content: '测试测试'
+		},
+		{
+			id: '2',
+			title: '手术提醒',
+			type: '',
+			state: '',
+			date: getFirstDayOfWeek(e, 4),
+			time: getFirstDayOfWeek(e, 4),
+			content: '测试测试'
+		}
+	]*/
 }
+
+const handleDatePickerOpen = () => {
+	datePickerRef.value.handleOpen();
+}
+
 function setDate(e: Date) {
-    currentDate.value = e
-    record.value = recordWeek.value.filter((r: any) => dateFormater('yyyy-MM-dd', r.date) === dateFormater('yyyy-MM-dd', e))
+	currentDate.value = e
+	getDatePlanList();
 }
+
+function getDatePlanList() {}
+
 const addRecord = () => {
-    const e = currentDate.value || new Date()
-    isRecordDialog.value = true
-    setTimeout(() => {
-        recordFormRef.value.resetData()
-        recordFormRef.value.formData.date = e
-        recordFormRef.value.formData.isRemoveBtn = false
-    }, 0)
+	const e = currentDate.value || new Date()
+	isRecordDialog.value = true
+	setTimeout(() => {
+		recordFormRef.value.resetData(false, dateFormater("yyyy-MM-dd", e));
+	}, 0)
 }
 const viewRecord = (e: any) => {
-    isRecordDialog.value = true
-    setTimeout(() => {
-        recordFormRef.value.resetData()
-        recordFormRef.value.formData = Object.assign({}, recordFormRef.value.formData, e)
-        recordFormRef.value.formData.isRemoveBtn = true
-        // console.log(recordFormRef.value.formData)
-    }, 0)
+	isRecordDialog.value = true
+	setTimeout(() => {
+		recordFormRef.value.resetData(true)
+		recordFormRef.value.formData = Object.assign({}, recordFormRef.value.formData, e)
+		// console.log(recordFormRef.value.formData)
+	}, 0)
 }
 const remoteRecord = (item: any, index: number) => {
-    ElMessageBox.confirm(
-        '是否确认删除？',
-        {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            draggable: true
-        }
-    ).then(() => {
-        ElMessage.success('删除成功！')
-        recordWeek.value = recordWeek.value.filter((r: any) => r.id !== item.id)
-        setDate(item.date)
-    }).catch(() => { })
+	ElMessageBox.confirm(
+		'是否确认删除？',
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+			draggable: true
+		}
+	).then(() => {
+		ElMessage.success('删除成功！')
+		recordWeek.value = recordWeek.value.filter((r: any) => r.id !== item.id)
+		setDate(item.date)
+	}).catch(() => {
+	})
 }
 const saveData = (e: any) => {
-    recordWeek.value.push(e)
-    setDate(e.date)
+	recordWeek.value.push(e);
+	setDate(new Date(e.date));
 }
 </script>
 
 <style lang='scss' scoped>
 .week-calendar-part {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
 
-    .header-box {
-        width: 100%;
-        height: 50px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+	.header-box {
+		width: 100%;
+		height: 50px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 
-        .el-icon {
-            cursor: pointer;
-        }
+		.el-icon {
+			cursor: pointer;
+		}
 
-        .date-block {
-            position: relative;
+		.date-block {
+			position: relative;
 
-            &>span {
-                cursor: pointer;
-            }
+			& > span {
+				cursor: pointer;
+			}
 
-            :deep(.month-date-pick) {
-                position: absolute;
-                width: 0;
-                height: 0;
-                bottom: 0;
-                left: 50%;
-                overflow: hidden;
-            }
-        }
-    }
+			:deep(.month-date-pick) {
+				position: absolute;
+				width: 0;
+				height: 0;
+				bottom: 0;
+				left: 50%;
+				overflow: hidden;
+			}
+		}
+	}
 
-    .week-box {
-        width: 100%;
-        height: 80px;
-        border-top: 1px solid $border-color;
+	.week-box {
+		width: 100%;
+		height: 80px;
+		border-top: 1px solid $border-color;
 
-        table {
-            width: 100%;
-            height: 80px;
-            text-align: center;
+		table {
+			width: 100%;
+			height: 80px;
+			text-align: center;
 
-            tr {
-                td {
-                    font-weight: 600;
-                    color: black;
+			tr {
+				td {
+					font-weight: 600;
+					color: black;
 
-                    span {
-                        cursor: pointer;
-                        width: 30px;
-                        height: 30px;
-                        border: 2px solid transparent;
-                        border-radius: 50%;
-                        display: flex;
-                        margin: 0 auto;
-                        justify-content: center;
-                        align-items: center;
-                        transition: all .3s;
+					span {
+						cursor: pointer;
+						width: 30px;
+						height: 30px;
+						border: 2px solid transparent;
+						border-radius: 50%;
+						display: flex;
+						margin: 0 auto;
+						justify-content: center;
+						align-items: center;
+						transition: all .3s;
 
-                        &:hover {
-                            background: rgba($main-color, .1);
-                            transition: all .3s;
-                        }
-                    }
-                }
+						&:hover {
+							background: rgba($main-color, .1);
+							transition: all .3s;
+						}
+					}
+				}
 
-                .record-mark {
-                    color: $main-color;
+				.record-mark {
+					color: $main-color;
 
-                    span {
-                        border-color: $main-color;
-                    }
-                }
+					span {
+						border-color: $main-color;
+					}
+				}
 
-                .active {
-                    color: white;
+				.active {
+					color: white;
 
-                    span {
-                        color: white;
-                        border-color: $main-color;
-                        background: $main-color;
+					span {
+						color: white;
+						border-color: $main-color;
+						background: $main-color;
 
-                        &:hover {
-                            background: rgba($main-color, .8);
-                        }
-                    }
-                }
-            }
-        }
-    }
+						&:hover {
+							background: rgba($main-color, .8);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    .record-box {
-        width: 100%;
-        height: calc(100% - 170px);
-        overflow-x: hidden;
-        overflow-y: auto;
+	.record-box {
+		width: 100%;
+		height: calc(100% - 170px);
+		overflow-x: hidden;
+		overflow-y: auto;
 
-        .record-item {
-            position: relative;
-            width: 100%;
-            display: flex;
-            align-items: center;
-            padding: 10px 20px;
-            transition: all .6s;
+		.record-item {
+			position: relative;
+			width: 100%;
+			display: flex;
+			align-items: center;
+			padding: 10px 20px;
+			transition: all .6s;
 
-            &:hover {
-                background: rgba($main-color, .1);
-                transition: all .6s;
-            }
+			&:hover {
+				background: rgba($main-color, .1);
+				transition: all .6s;
+			}
 
-            .icon-box {
-                flex-shrink: 0;
-                width: 50px;
-                height: 50px;
-                border-radius: 8px;
-                background: rgba($main-color, .1);
-                color: $main-color;
-                font-size: 32px;
-                text-align: center;
-                line-height: 50px;
-                margin-right: 15px;
-            }
+			.icon-box {
+				flex-shrink: 0;
+				width: 50px;
+				height: 50px;
+				border-radius: 8px;
+				background: rgba($main-color, .1);
+				color: $main-color;
+				font-size: 32px;
+				text-align: center;
+				line-height: 50px;
+				margin-right: 15px;
+			}
 
-            .remove-icon {
-                cursor: pointer;
-                position: absolute;
-                font-size: 20px;
-                top: calc(50% - 10px);
-                right: 20px;
-                color: $text3-color;
-            }
-        }
-    }
+			.remove-icon {
+				cursor: pointer;
+				position: absolute;
+				font-size: 20px;
+				top: calc(50% - 10px);
+				right: 20px;
+				color: $text3-color;
+			}
+		}
+	}
 }
 </style>

From 68902cc8f1afab7a09481fc5282b957662dd8ff0 Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Wed, 24 Apr 2024 14:09:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/daily-plan.ts            | 48 +++++++++++++++++++-
 src/views/home/index.vue         | 17 ++++++-
 src/views/home/record-form.vue   | 64 ++++++++++++++++++--------
 src/views/home/week-calendar.vue | 78 ++++++++++++++++----------------
 4 files changed, 147 insertions(+), 60 deletions(-)

diff --git a/src/api/daily-plan.ts b/src/api/daily-plan.ts
index c0a216d..ef5a23e 100644
--- a/src/api/daily-plan.ts
+++ b/src/api/daily-plan.ts
@@ -1,8 +1,12 @@
 import request from "@/utils/request";
 
-const addDailyPlanUrl = "/admin/dailyPlan/addDailyPlan";
+const addDailyPlanUrl = "/admin/dailyPlan/saveOrUpdate";
+const getDailyPlanListUrl = "/admin/dailyPlan/getListByDate";
+const deleteByIdUrl = "/admin/dailyPlan/deleteById";
+const getPlanDateListUrl = "/admin/dailyPlan/getPlanDateList";
+const getTodoCountByDateUrl = "/admin/dailyPlan/getTodoCountByDate";
 
-export function addDailyPlan(param: any) {
+export function saveOrUpdate(param: any) {
 	return new Promise((resolve, reject) => {
 		request.postForm(addDailyPlanUrl, param).then((res: any) => {
 			resolve(res.data);
@@ -10,4 +14,44 @@ export function addDailyPlan(param: any) {
 			reject(err);
 		})
 	})
+}
+
+export function getDailyPlanList(date: string) {
+	return new Promise((resolve, reject) => {
+		request.postForm(getDailyPlanListUrl, {date}).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	})
+}
+
+export function deleteById(id: string) {
+	return new Promise((resolve, reject) => {
+		request.postForm(deleteByIdUrl, {id}).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	})
+}
+
+export function getPlanDateList(startDate: string, endDate: string) {
+	return new Promise((resolve, reject) => {
+		request.postForm(getPlanDateListUrl, {startDate, endDate}).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	})
+}
+
+export function getTodoCountByDate(date: string) {
+	return new Promise((resolve, reject) => {
+		request.postForm(getTodoCountByDateUrl, {date}).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	});
 }
\ No newline at end of file
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 56283d7..befb5a5 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script lang='ts' setup>
-import {onMounted, reactive, ref, toRefs, watch} from 'vue'
+import {onMounted, ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {useLoginStore} from '@/stores/user-info-store'
 import NumberChart from "./number-chart.vue";
@@ -68,6 +68,8 @@ import TimeChart from "./time-chart.vue";
 import TimeBarChart from "./time-bar-chart.vue";
 import WeekCalendar from "./week-calendar.vue";
 import SystemLogs from "@/components/system-logs.vue";
+import * as dailyPlanApi from "@/api/daily-plan";
+import {dateFormater} from "@/utils/date-util";
 
 
 const router = useRouter()
@@ -85,6 +87,19 @@ messages.value.push({
 	type: '公告',
 	content: '公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试公告测试'
 })
+
+onMounted(() => {
+	getTodoCount();
+})
+
+function getTodoCount() {
+	dailyPlanApi.getTodoCountByDate(dateFormater("yyyy-MM-dd", new Date())).then((res: any) => {
+		if (res.code == 0) {
+			total.value = res.data;
+		}
+	});
+}
+
 </script>
 
 <style lang='scss' scoped>
diff --git a/src/views/home/record-form.vue b/src/views/home/record-form.vue
index 7a4f508..d726e44 100644
--- a/src/views/home/record-form.vue
+++ b/src/views/home/record-form.vue
@@ -39,8 +39,12 @@
 import {onMounted, reactive, ref} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {dateFormater} from "@/utils/date-util";
+import * as dailyPlanApi from "@/api/daily-plan";
 
-const emit = defineEmits(['close', 'saveData'])
+const emit = defineEmits(['close', 'saveData', "removeEvent"])
+defineExpose({
+	resetData
+})
 const typeOption = [
 	{label: '手术', value: '手术'},
 	{label: '会议', value: '会议'},
@@ -81,9 +85,6 @@ const formData = ref({
 })
 const isSaveBtn = ref(true);
 const isRemoveBtn = ref(true);
-defineExpose({
-	resetData
-})
 
 onMounted(() => {
 	formData.value = {
@@ -101,28 +102,45 @@ function close() {
 	emit('close')
 }
 
-function resetData(hasRmBtn: boolean, date?: string) {
+function resetData(hasRmBtn: boolean, date?: string, form?: any) {
 	formRef.value.resetFields()
-	Object.assign(formData.value, {
-		id: '',
-		title: '',
-		type: '',
-		status: '',
-		date: date ? date : '',
-		time: '',
-		content: ''
-	})
+	if (form) {
+		const tempForm = Object.assign({}, form);
+		const planDate = new Date(tempForm.date + " " + tempForm.time);
+		tempForm.date = planDate;
+		tempForm.time = planDate;
+		formData.value = tempForm;
+	} else {
+		Object.assign(formData.value, {
+			id: '',
+			title: '',
+			type: '',
+			status: '',
+			date: date ? date : '',
+			time: '',
+			content: ''
+		})
+	}
 	isRemoveBtn.value = hasRmBtn;
 }
 
 const saveData = () => {
 	formRef.value.validate((valid: any, fields: any) => {
 		if (valid) {
-			ElMessage.success('保存成功！');
 			const form = JSON.parse(JSON.stringify(formData.value));
 			form.time = dateFormater("HH:mm:ss", new Date(form.time));
-			emit('saveData', form);
-			close();
+			form.date = dateFormater("yyyy-MM-dd", new Date(form.date));
+			dailyPlanApi.saveOrUpdate(form).then((res: any) => {
+				if (res.code == 0) {
+					ElMessage.success('保存成功！');
+					emit('saveData', form);
+					close();
+				} else {
+					ElMessage.error(res.msg);
+				}
+			}).catch(error => {
+				ElMessage.error("服务端异常");
+			})
 		} else {
 			// console.log('error submit!', fields)
 		}
@@ -138,9 +156,17 @@ const removeData = () => {
 			draggable: true
 		}
 	).then(() => {
-		ElMessage.success('删除成功！')
-		close()
+		dailyPlanApi.deleteById(formData.value.id).then((res: any) => {
+			if (res.code == 0) {
+				ElMessage.success('删除成功！');
+				close();
+				emit("removeEvent");
+			} else {
+				ElMessage.error(res.msg);
+			}
+		});
 	}).catch(() => {
+		ElMessage.error("服务器异常");
 	})
 }
 </script>
diff --git a/src/views/home/week-calendar.vue b/src/views/home/week-calendar.vue
index 3369b91..1a5e8c1 100644
--- a/src/views/home/week-calendar.vue
+++ b/src/views/home/week-calendar.vue
@@ -23,10 +23,11 @@
 					<th v-for="item in weekCn" :key="item">{{ item }}</th>
 				</tr>
 				<tr v-if="week.length > 0" class="">
-					<td v-for="item in week" :key="item" :class="{
-                        'record-mark': recordWeek.some((r: any) => dateFormater('yyyy-MM-dd', r.date) === dateFormater('yyyy-MM-dd', item)),
-                        'active': dateFormater('yyyy-MM-dd', item) === dateFormater('yyyy-MM-dd', currentDate)
-                    }">
+					<td v-for="item in week" :key="item"
+							:class="{
+								'record-mark': recordWeek.some((r: any) => r == dateFormater('yyyy-MM-dd', item)),
+								'active':
+								dateFormater('yyyy-MM-dd', item) == dateFormater('yyyy-MM-dd', currentDate)}">
                         <span :class="{
                             'text2-color': item.getDate() > week[6].getDate()
                         }" @click="setDate(item)">{{ dateFormater('dd', item) }}</span>
@@ -46,7 +47,7 @@
 					<p class="main-color" style="font-weight: 600;cursor: pointer;">{{
 							item.title
 						}}</p>
-					<p p class=" text2-color font14">{{ dateFormater('yyyy-MM-dd HH:mm:ss', item.time) }}</p>
+					<p p class=" text2-color font14">{{ item.date + " " + item.time }}</p>
 				</div>
 				<el-icon class="remove-icon" @click.stop="remoteRecord(item, index)">
 					<Close/>
@@ -55,7 +56,8 @@
 		</div>
 
 		<el-dialog v-model="isRecordDialog" title="详情">
-			<RecordForm ref="recordFormRef" @close="isRecordDialog = false" @saveData="saveData"/>
+			<RecordForm ref="recordFormRef" @remove-event="planRemoveEvent" @close="isRecordDialog = false"
+									@saveData="saveData"/>
 		</el-dialog>
 	</div>
 </template>
@@ -65,6 +67,7 @@ import {onMounted, ref} from 'vue'
 import RecordForm from './record-form.vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {dateFormater, getDays, getFirstDayOfWeek} from '@/utils/date-util'
+import * as dailyPlanApi from "@/api/daily-plan";
 
 const monthCn = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'];
 const weekCn = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
@@ -110,38 +113,23 @@ function setMonthWeek() {
  * 获取一周的数据，然后给每天打 record-mark 标记
  */
 function setWeek(date: any) {
-	getWeekPlanList();
-
 	week.value = [];
 	setTimeout(() => {
 		for (let i = 0; i < 7; i++) {
 			week.value.push(getFirstDayOfWeek(date, i + 1));
 		}
+		getWeekPlanList(week.value[0], week.value[6]);
 	}, 0)
 }
 
-function getWeekPlanList() {
-	recordWeek.value = []
-	/*recordWeek.value = [
-		{
-			id: '1',
-			title: '月度会议',
-			type: '',
-			state: '',
-			date: getFirstDayOfWeek(e, 1),
-			time: getFirstDayOfWeek(e, 1),
-			content: '测试测试'
-		},
-		{
-			id: '2',
-			title: '手术提醒',
-			type: '',
-			state: '',
-			date: getFirstDayOfWeek(e, 4),
-			time: getFirstDayOfWeek(e, 4),
-			content: '测试测试'
+function getWeekPlanList(startDate: any, endDate: any) {
+	recordWeek.value = [];
+	dailyPlanApi.getPlanDateList(dateFormater("yyyy-MM-dd", startDate),
+		dateFormater("yyyy-MM-dd", endDate)).then((res: any) => {
+		if (res.code == 0) {
+			recordWeek.value = res.data;
 		}
-	]*/
+	});
 }
 
 const handleDatePickerOpen = () => {
@@ -150,10 +138,17 @@ const handleDatePickerOpen = () => {
 
 function setDate(e: Date) {
 	currentDate.value = e
+	getWeekPlanList(week.value[0], week.value[6]);
 	getDatePlanList();
 }
 
-function getDatePlanList() {}
+function getDatePlanList() {
+	dailyPlanApi.getDailyPlanList(dateFormater("yyyy-MM-dd", currentDate.value)).then((res: any) => {
+		if (res.code == 0) {
+			record.value = res.data;
+		}
+	});
+}
 
 const addRecord = () => {
 	const e = currentDate.value || new Date()
@@ -165,9 +160,7 @@ const addRecord = () => {
 const viewRecord = (e: any) => {
 	isRecordDialog.value = true
 	setTimeout(() => {
-		recordFormRef.value.resetData(true)
-		recordFormRef.value.formData = Object.assign({}, recordFormRef.value.formData, e)
-		// console.log(recordFormRef.value.formData)
+		recordFormRef.value.resetData(true, null, e);
 	}, 0)
 }
 const remoteRecord = (item: any, index: number) => {
@@ -180,16 +173,25 @@ const remoteRecord = (item: any, index: number) => {
 			draggable: true
 		}
 	).then(() => {
-		ElMessage.success('删除成功！')
-		recordWeek.value = recordWeek.value.filter((r: any) => r.id !== item.id)
-		setDate(item.date)
-	}).catch(() => {
+		dailyPlanApi.deleteById(item.id).then((res: any) => {
+			if (res.code == 0) {
+				ElMessage.success('删除成功！');
+				setDate(item.date);
+			} else {
+				ElMessage.error(res.msg);
+			}
+		}).catch(err => {
+			ElMessage.error("服务器异常");
+		})
 	})
 }
 const saveData = (e: any) => {
-	recordWeek.value.push(e);
 	setDate(new Date(e.date));
 }
+
+const planRemoveEvent = () => {
+	setDate(currentDate.value)
+}
 </script>
 
 <style lang='scss' scoped>

From eb55210101c329c01221355e27b188136fa7b0a2 Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Wed, 24 Apr 2024 15:11:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/log-manage.ts          | 41 +++++++++++++++++++++-------------
 src/components/system-logs.vue | 27 +++++++++++++---------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/api/log-manage.ts b/src/api/log-manage.ts
index e002adb..3341e37 100644
--- a/src/api/log-manage.ts
+++ b/src/api/log-manage.ts
@@ -1,21 +1,32 @@
 import request, {CommonHeaderEnum} from "@/utils/request";
 
 const getMonthlyLogCountUrl = '/admin/log/getMonthlyLogCount'
+const getPageUrl = "/admin/log/page";
 
 export function getMonthlyLogCount(startTime: string, endTime: string) {
-    return new Promise(resolve => {
-        request({
-            url: getMonthlyLogCountUrl,
-            method: 'post',
-            data: {
-                startTime,
-                endTime
-            },
-            headers: {
-                'Content-Type': CommonHeaderEnum.FORM_CONTENT_TYPE,
-            },
-        }).then(res => {
-            resolve(res.data);
-        })
-    })
+	return new Promise(resolve => {
+		request({
+			url: getMonthlyLogCountUrl,
+			method: 'post',
+			data: {
+				startTime,
+				endTime
+			},
+			headers: {
+				'Content-Type': CommonHeaderEnum.FORM_CONTENT_TYPE,
+			},
+		}).then(res => {
+			resolve(res.data);
+		})
+	})
+}
+
+export function getPage(current: number, size: number) {
+	return new Promise((resolve, reject) => {
+		request.get(getPageUrl + `?current=${current}&size=${size}`).then((res: any) => {
+			resolve(res.data);
+		}).catch(err => {
+			reject(err);
+		})
+	})
 }
\ No newline at end of file
diff --git a/src/components/system-logs.vue b/src/components/system-logs.vue
index 38eacd3..3529954 100644
--- a/src/components/system-logs.vue
+++ b/src/components/system-logs.vue
@@ -1,23 +1,28 @@
 <template>
     <el-timeline>
-        <el-timeline-item v-for="(item, index) in activities" :key="index" :timestamp="item.time">
-            {{ item.title + '-' + item.ip }}
+        <el-timeline-item v-for="(item, index) in activities" :key="index" :timestamp="item.createTime">
+            {{ item.title + '-' + item.remoteAddr }}
         </el-timeline-item>
     </el-timeline>
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
-import { dateFormater } from '@/utils/date-util';
+import {onMounted, ref} from 'vue'
+import * as logManageApi from "@/api/log-manage";
 
-const activities: any = []
+const activities = ref([] as any);
 
-while (activities.length < 10) {
-    activities.push({
-        time: dateFormater('yyyy-MM-dd HH:mm:ss'),
-        title: '登录成功',
-        ip: '127.0.0.1'
-    })
+onMounted(function () {
+	getLogList();
+});
+
+function getLogList() {
+	logManageApi.getPage(0, 100).then((res: any) => {
+		if (res.code == 0) {
+			activities.value = res.data.records;
+			console.log(activities.value)
+		}
+	})
 }
 </script>