From a1729469293608338f0eca47b811dc5c8c21fcb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E7=8C=AB?=
<13581431+xiongmao1988@user.noreply.gitee.com>
Date: Wed, 24 Apr 2024 14:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/login.vue | 40 +++++++------------
.../remote-manage/part/remote-dialog.vue | 5 ++-
vite.config.ts | 4 +-
3 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index a176562..6bf4733 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -152,28 +152,9 @@ const phoneAreas: any = getPhoneAreasData()
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位（字母，数字，下划线，减号）'));
- }
-}
-
-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个特殊字符'));
- }
-}
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[34578]\d{9}$/;
if (value.indexOf('****') >= 0) {
@@ -190,10 +171,14 @@ const validatorPhone = (rule: any, value: any, callback: any) => {
const loginRules = reactive({
account: [
- {required: true, validator: validatorUserName, trigger: 'change'},
+ {required: true,message: '请输入用户名', trigger: 'change'},
+ { min: 2, max: 18, message: "长度在 6 到 18个字符" },
+ //{pattern:/^(?![^A-Za-z]+$)(?![^0-9]+$)[0-9A-Za-z_]{4,15}$/, message: '长度在4-15位，数字、字母、下划线的组合，其中数字和字母必须同时存在'}
],
password: [
- {required: true, validator: validatorPassword, trigger: 'change'},
+ {required: true, message: '请输入密码', trigger: 'blur'},
+ { min: 5,max: 25,message: '长度在 5 到 25个字符'},
+ {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
],
phone: [
{required: true, validator: validatorPhone, trigger: 'blur'},
@@ -204,13 +189,18 @@ const loginRules = reactive({
})
const registerRules = reactive({
username: [
- {required: true, validator: validatorUserName, trigger: 'change'},
+ {required: true, message: '请输入用户名', trigger: 'change'},
+ { min: 2, max: 18, message: "长度在 6 到 18个字符" },
+ //{pattern:/^(?![^A-Za-z]+$)(?![^0-9]+$)[0-9A-Za-z_]{4,15}$/, message: '长度在4-15位，数字、字母、下划线的组合，其中数字和字母必须同时存在'}
],
password: [
- {required: true, validator: validatorUserName, trigger: 'change'},
+ {required: true, message: '请输入密码', trigger: 'blur'},
+ { min: 5,max: 25,message: '长度在 5 到 25个字符'},
+ {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
],
name: [
- {required: true, message: '请输入用户名', trigger: 'blur'},
+ {required: true, message: '请输入真实姓名', trigger: 'blur'},
+ {pattern:/^[\u4E00-\u9FA5]{2,6}$/, message: '请输入2-6个汉字'}
],
phone: [
{required: true, validator: validatorPhone, trigger: 'change'},
diff --git a/src/views/remote-manage/part/remote-dialog.vue b/src/views/remote-manage/part/remote-dialog.vue
index dd60c7c..7ee33f6 100644
--- a/src/views/remote-manage/part/remote-dialog.vue
+++ b/src/views/remote-manage/part/remote-dialog.vue
@@ -5,12 +5,13 @@
连接云服务器
-
云服务器连接状态：{{ patientInfo.isRemote ? '已连接' : '未连接' }}
+
云服务器连接状态：{{ patientInfo.isRemote ? '已连接' : '未连接' }}
输入用户名：{{ patientInfo.serverUser }}
密码：*********
输入病人姓名：
-
输入病人身份证号：
+
输入病人住院号：
+
diff --git a/vite.config.ts b/vite.config.ts
index aced26f..3856a65 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -24,14 +24,14 @@ export default defineConfig({
proxy: {
'/api': {
//target: 'http://192.168.137.235:9999', // 目标服务器地址
- target: 'http://localhost:9999', // 目标服务器地址
+ target: 'http://192.168.1.110:9999', // 目标服务器地址
ws: true, // 是否启用 WebSocket
changeOrigin: true, // 是否修改请求头中的 Origin 字段
rewrite: (path) => path.replace(/^\/api/, ''),
},
'/socket.io': {
//target: 'ws://192.168.137.235:9999',
- target: 'ws://localhost:9999',
+ target: 'ws://192.168.1.110:9999',
ws: true,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/socket.io/, ''),