From dbb4bd5da24721a78a1fb714b7ab89331ee49b4d Mon Sep 17 00:00:00 2001
From: zhaoyz <11@22.com>
Date: Tue, 6 Aug 2024 14:54:35 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E5=8F=91=E9=80=81ping?=
 =?UTF-8?q?=E7=9A=84=20id,name,date=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/remote-ws-store.ts              | 3 +++
 src/views/login/login.vue                  | 2 +-
 src/views/remote-manage/remote-control.vue | 2 +-
 vite.config.ts                             | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/stores/remote-ws-store.ts b/src/stores/remote-ws-store.ts
index 9640793..85fdc9e 100644
--- a/src/stores/remote-ws-store.ts
+++ b/src/stores/remote-ws-store.ts
@@ -347,6 +347,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
           if (patient) {
               patient.medicineWS.send(JSON.stringify({msgType: "ping",patientName: name,
               idNum: id,
+              date: date,
               msg: + new Date()}))
           }
         },
@@ -380,6 +381,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
             }
         },
         sendMedicine(args: {
+            msgType: string,
             name: string,
             id: string,
             date: string,
@@ -392,6 +394,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
             const patient: any = this.patient[args.name + args.id + args.date + args.index]
             if (patient) {
                 const params = {
+                    msgType: args.msgType,
                     patientName: args.name,
                     idNum: args.id,
                     date: args.date,
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index e7ade28..d5d274c 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -12,7 +12,7 @@
             <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>-->
+                    <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">
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index a1a1c80..413b927 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -331,7 +331,6 @@ watch(subscribeMedicineData,(newValue:any,oldValue:any)=>{
       case 'pong':
         timeDiffPing.value=newValue.msg;
         break;
-    
       default:
         break;
     }
@@ -717,6 +716,7 @@ const tableItemConfirm = (e: any, tableData: any) => {
         // 点击确定按钮后的逻辑
         if (tableData.length < 1) return;
         const params = {
+          msgType: "addMedicine",
           name: currentRemote.value.patient,
           id: currentRemote.value.patientId,
           date: currentRemote.value.date,
diff --git a/vite.config.ts b/vite.config.ts
index d3def73..aae3ad1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -24,6 +24,7 @@ export default defineConfig({
     proxy: {
       '/api': {
         // target: 'http://localhost:9999', // 目标服务器地址
+        // target: 'http://localhost:6379', // 目标服务器地址
         target: 'http://110.41.142.124:6379', // 目标服务器地址
         ws: true, // 是否启用 WebSocket
         changeOrigin: true, // 是否修改请求头中的 Origin 字段
@@ -31,6 +32,7 @@ export default defineConfig({
       },
       '/socket.io': {
         // target: 'ws://localhost:9999',
+        // target: 'ws://localhost:6379',
         target: 'ws://110.41.142.124:6379',
         ws: true,
         changeOrigin: true,