diff --git a/src/router/routes.ts b/src/router/routes.ts
index 388e27f..55660bc 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -21,7 +21,6 @@ export const constantRoute = [
       {
         path: '/permissions-manage',
         name: '权限管理',
-        redirect: '/permissions-manage/doctor-manage',
         component: () => import('@/views/permissions-manage/index.vue'),
         children: [
           {
@@ -113,7 +112,6 @@ export const constantRoute = [
       {
         path: '/logs-manage',
         name: '系统管理',
-        redirect: '/logs-manage/message-manage',
         component: () => import('@/views/logs-manage/index.vue'),
         children: [
           {
diff --git a/src/stores/user-info-store.ts b/src/stores/user-info-store.ts
index cb1d107..42faec3 100644
--- a/src/stores/user-info-store.ts
+++ b/src/stores/user-info-store.ts
@@ -4,77 +4,88 @@ import {Local, Session} from "@/utils/storage";
 import router from "@/router";
 
 export const useUserStore = defineStore('login', {
-  state: () => {
-    return {
-      userInfo: {
-        account: '',
-        name: '',
-        /**
-         * 公司： 后台管理
-         * 医院高级管理员： 首页、权限管理、患者管理、远程管理、日志管理
-         * 医院中级管理员： 首页、患者管理、远程管理
-         * 医院普通用户： 首页、患者管理
-         */
-        hospitalName: '',
-        hospitalId: '',
-        menuPathList: {
-          paths: [],
-          menus: []
-        },
-        roleName: ''
-      } as any,
-      showHomeMsg: false
-    }
-  },
-  actions: {
-    getlogin() {
-      const onlineUser = Session.get("onlineUser");
-      return this.userInfo.account && this.userInfo.account != null ? this.userInfo : onlineUser
-    },
-    setlogin(key: string, e: any) {
-      this.userInfo[key] = e
-      Session.set("onlineUser", this.userInfo);
-    },
-    logout() {
-      Session.clear();
-      Local.clear();
-      router.removeRoute("root");
-      router.addRoute({
-        name: "root",
-        path: "/",
-        redirect: "/login"
-      })
-    },
-    getMenuPathList(): Promise<any> {
-      return new Promise(resolve => {
-        if (this.userInfo.menuPathList.paths.length == 0) {
-          getUserMenu().then((res: any) => {
-            if (res && res.code == 0) {
-              const paths: any = [];
-              const menus: any = [];
-              res.data.forEach((item: any) => {
-                handleMenuPath(item, paths, menus);
-              });
-              this.userInfo.menuPathList = {paths, menus};
-              resolve(this.userInfo.menuPathList);
-            }
-          })
-        } else {
-          resolve(this.userInfo.menuPathList)
+    state: () => {
+        return {
+            userInfo: {
+                account: '',
+                name: '',
+                /**
+                 * 公司： 后台管理
+                 * 医院高级管理员： 首页、权限管理、患者管理、远程管理、日志管理
+                 * 医院中级管理员： 首页、患者管理、远程管理
+                 * 医院普通用户： 首页、患者管理
+                 */
+                hospitalName: '',
+                hospitalId: '',
+                menuPathList: {
+                    paths: [],
+                    menus: []
+                },
+                roleName: ''
+            } as any,
+            showHomeMsg: false
+        }
+    },
+    actions: {
+        getlogin() {
+            const onlineUser = Session.get("onlineUser");
+            return this.userInfo.account && this.userInfo.account != null ? this.userInfo : onlineUser
+        },
+        setlogin(key: string, e: any) {
+            this.userInfo[key] = e
+            Session.set("onlineUser", this.userInfo);
+        },
+        logout() {
+            Session.clear();
+            Local.clear();
+            router.removeRoute("root");
+            router.addRoute({
+                name: "root",
+                path: "/",
+                redirect: "/login"
+            })
+        },
+        getMenuPathList(): Promise<any> {
+            return new Promise(resolve => {
+                if (this.userInfo.menuPathList.paths.length == 0) {
+                    getUserMenu().then((res: any) => {
+                        if (res && res.code == 0) {
+                            const paths: any = [];
+                            const menus: any = [];
+                            res.data.forEach((item: any) => {
+                                handleMenuPath(item, paths, menus);
+                            });
+                            this.userInfo.menuPathList = {paths, menus};
+                            resolve(this.userInfo.menuPathList);
+                        }
+                    })
+                } else {
+                    resolve(this.userInfo.menuPathList)
+                }
+            })
+        },
+        getMenuChild(path: string) {
+            return new Promise(resolve => {
+                this.getMenuPathList().then((res: any) => {
+                    res.menus.forEach((menu: any) => {
+                        if (menu.path == path) {
+                            resolve(menu.children)
+                        }
+                    });
+                })
+            })
         }
-      })
     }
-  },
 })
 
 function handleMenuPath(menu: any, paths: any, menus?: any) {
-  paths.push(menu.path);
-  if (menus) {
-    menus.push(menu);
-  }
-  if (menu.children && menu.children.length > 0) {
-    menu.children.forEach((child: any) => {
-      handleMenuPath(child, paths);
-    })
-  }
+    paths.push(menu.path);
+    if (menus) {
+        menus.push(menu);
+    }
+    if (menu.children && menu.children.length > 0) {
+        menu.children.forEach((child: any) => {
+            handleMenuPath(child, paths);
+        })
+    }
 }
\ No newline at end of file
diff --git a/src/utils/request.ts b/src/utils/request.ts
index d461504..911565c 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -79,7 +79,7 @@ function handleResponse(response: any) {
 
 axiosInstance.interceptors.response.use(handleResponse, error => {
     const code = error.response.status || 200
-    if (code == 424 || code == 401) {
+    if (code == 424) {
         ElMessageBox.confirm('令牌状态已过期，请点击重新登录', "系统提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index cdd190e..bc3e42d 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -1,127 +1,133 @@
 <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>
+                                            <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="请输入用户名2~16位字母或数字（区分大小写）"></el-input>
+                    </el-form-item>
+                    <el-form-item label="密码" prop="password">
+                        <el-input v-model="registerParams.password" type="password" show-password
+                                  placeholder="请输入密码8~16位字母或数字（区分大小写）"></el-input>
+                    </el-form-item>
+                    <el-form-item label="确认密码" prop="confirmPassword">
+                        <el-input v-model="registerParams.confirmPassword" type="password" show-password
+                                  placeholder="请输入密码8~16位字母或数字（区分大小写）"></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>
+
         </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>
-        <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>
+    <SliderVerify v-model:isShowSelf="sliderVConf.isShowSelf" :width="sliderVConf.width" :imgUrl="sliderImgUrl"
+                  :height="sliderVConf.height" @success="sliderSuccess" @close="sliderClose"></SliderVerify>
 </template>
 
 <script lang='ts' setup>
@@ -150,59 +156,57 @@ const phoneAreas: any = getPhoneAreasData()
 let loading = ref(false);
 //自定义校验规则函数
 const validatorPhone = (rule: any, value: any, callback: any) => {
-  var isPhone = /^1[34578]\d{9}$/;
-  if (value.indexOf('****') >= 0) {
-    return callback().trim();
-  }
-  if (!isPhone.test(value)) {
-    callback(new Error('请输入合法手机号'));
-  } else {
-    callback();
-  }
+    var isPhone = /^1[34578]\d{9}$/;
+    if (value.indexOf('****') >= 0) {
+        return callback().trim();
+    }
+    if (!isPhone.test(value)) {
+        callback(new Error('请输入合法手机号'));
+    } else {
+        callback();
+    }
 }
 
 const loginRules = reactive({
-  account: [
-    {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, message: '请输入密码', trigger: 'blur'},
-    {min: 5, max: 25, message: '长度在 5 到 25个字符'},
-    {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
-  ],
-  phone: [
-    {required: true, validator: validatorPhone, trigger: 'blur'},
-  ],
-  code: [
-    {required: true, message: '请输入验证码', trigger: 'blur'},
-  ]
+    account: [
+        {required: true, message: '请输入用户名', trigger: 'change'},
+    ],
+    password: [
+        {required: true, message: '请输入用户名', trigger: 'change'},
+    ],
+    phone: [
+        {required: true, validator: validatorPhone, trigger: 'blur'},
+    ],
+    code: [
+        {required: true, message: '请输入验证码', trigger: 'blur'},
+    ]
 })
 const registerRules = reactive({
-  username: [
-    {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, message: '请输入密码', trigger: 'blur'},
-    {min: 5, max: 25, message: '长度在 5 到 25个字符'},
-    {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
-  ],
-  name: [
-    {required: true, message: '请输入真实姓名', trigger: 'blur'},
-    {pattern: /^[\u4E00-\u9FA5]{2,6}$/, message: '请输入2-6个汉字'}
-  ],
-  phone: [
-    {required: true, validator: validatorPhone, trigger: 'change'},
-  ],
-  hospital: [
-    {required: true, message: '请选择医院', trigger: 'blur'},
-  ],
-  code: [
-    {required: true, message: '请输入验证码', trigger: 'blur'},
-  ]
+    username: [
+        {required: true, message: '用户名不能为空', trigger: ['blur', 'change']},
+        {validator: validateAccount, trigger: ['blur', 'change']}
+    ],
+    password: [
+        {required: true, message: '密码不能为空', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
+    ],
+    confirmPassword: [
+        {required: true, message: '密码不能为空', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
+    ],
+    name: [
+        {required: true, message: '请输入真实姓名', trigger: 'blur'},
+        {pattern: /^[\u4E00-\u9FA5]{2,6}$/, message: '请输入2-6个汉字'}
+    ],
+    phone: [
+        {required: true, validator: validatorPhone, trigger: 'change'},
+    ],
+    hospital: [
+        {required: true, message: '请选择医院', trigger: 'blur'},
+    ],
+    code: [
+        {required: true, message: '请输入验证码', trigger: 'blur'},
+    ]
 })
 const loginFormRef = ref()
 const registerFormRef = ref()
@@ -211,29 +215,30 @@ const currentHospital = ref("")
 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: '',
+    name: '',
+    password: '',
+    phone: '',
+    phoneArea: phoneAreas[0],
+    code: '',
+    isSendCode: false,
+    sendTimer: 0,
+    sendText: '获取短信验证码'
 })
 const registerParams = ref({
-  username: '',
-  password: '',
-  name: '',
-  phone: '',
-  hospital: '',
-  sex: '',
-  code: ''
+    username: '',
+    password: '',
+    confirmPassword: '',
+    name: '',
+    phone: '',
+    hospital: '',
+    sex: '',
+    code: ''
 })
 const sliderVConf = ref({
-  isShowSelf: false,
-  width: 400,
-  height: 200
+    isShowSelf: false,
+    width: 400,
+    height: 200
 })
 
 const captchaImgUrl = ref('')
@@ -241,299 +246,317 @@ 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
+        }
+    })
 })
 
+function validatePass2(rule: any, value: any, callback: any) {
+    if (!(/^[a-zA-Z0-9]{8,16}$/.test(value))) {
+        callback("8~16位字母或数字（区分大小写）");
+    } else if (value !== registerParams.value.password) {
+        callback(new Error('两次密码不一致'));
+    } else {
+        callback()
+    }
+}
+
+function validateAccount(rule: any, value: any, callback: any) {
+    if (!(/^[a-zA-Z0-9]{2,16}$/.test(value))) {
+        callback("2~16位字母或数字（区分大小写）");
+    } else {
+        callback()
+    }
+}
+
 const selectHospital = (e: string) => {
 }
 
 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) => {
-  //加载效果:开始加载
-  // if (!currentHospital.value) {
-  //   ElMessage.warning('请在右上角选择院区')
-  //   return
-  // }
-  //加载效果:开始加载
-  loading.value = true;
-  //保证全部表单正常再发请求
-  await loginFormRef.value.validate((valid: any, fields: any) => {
-    if (valid) {
-      sliderVConf.value.isShowSelf = 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(),
-    hospitalId: currentHospital.value
-  }).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(),
+        hospitalId: currentHospital.value
+    }).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 信息
-      ElNotification({
-        type: 'success',
-        message: '欢迎回来',
-        title: `HI,${getTime()}好`
-      });
-      loginPost(data)
-      router.removeRoute("root");
-      router.addRoute({
-        name: "root",
-        path: "/",
-        redirect: "/remote-manage"
-      })
-      router.replace('/remote-manage')
-    }
-  })
+            ElNotification({
+                type: 'success',
+                message: '欢迎回来',
+                title: `HI,${getTime()}好`
+            });
+            loginPost(data)
+            router.removeRoute("root");
+            router.addRoute({
+                name: "root",
+                path: "/",
+                redirect: "/remote-manage"
+            })
+            router.replace('/remote-manage')
+        }
+    })
 }
 
 function sliderClose() {
-  loading.value = false
+    loading.value = false
 }
 
 const loginPost = (data: any) => {
-  Session.set('token', data.access_token);
-  Session.set('refresh_token', data.refresh_token);
-  useUserStore().setlogin('account', data.username)
-  useUserStore().setlogin('name', data.user_info.chineseName || '暂未设置姓名')
-  useUserStore().setlogin("hospitalId", data.user_info.hospitalId)
+    Session.set('token', data.access_token);
+    Session.set('refresh_token', data.refresh_token);
+    useUserStore().setlogin('account', data.username)
+    useUserStore().setlogin('name', data.user_info.chineseName || '暂未设置姓名')
+    useUserStore().setlogin("hospitalId", data.user_info.hospitalId)
 }
 
 </script>
 
 <style lang='scss' scoped>
 .login-page {
-  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;
-  }
-
-  .right-content {
-    position: relative;
-    width: 50%;
+    width: 100%;
     height: 100%;
     display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
+    background-color: #F8F8F8;
 
-    .select-hospital-box {
-      position: absolute;
-      top: 25px;
-      right: 25px;
-
-      .select-hospital {
-        width: 12rem;
-        margin-right: 20px;
-      }
+    .left-content {
+        width: 50%;
+        height: 100%;
+        background: url(@/assets/imgs/login/login_bck.png) no-repeat;
+        background-size: cover;
     }
 
-    .logo {
-      height: 70px;
-    }
-
-    .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;
-
-        span {
-          cursor: pointer;
-          margin-right: 10px;
-        }
-
-        .active {
-          color: $main-color;
-          font-weight: 600;
-        }
-      }
-
-      .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-group__append {
-            position: relative;
-
-            &::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;
-          }
-        }
-
-        .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;
-      }
-
-      .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;
-
-      .header-box {
+    .right-content {
+        position: relative;
+        width: 50%;
+        height: 100%;
         display: flex;
-        justify-content: space-between;
-        margin-bottom: 30px;
-
-        .title {
-          font-size: 20px;
-          color: $main-color;
-          font-weight: 600;
-        }
-
-        .el-icon {
-          cursor: pointer;
-        }
-      }
-
-      .footer-box {
-        padding-left: 100px;
-        display: flex;
-        justify-content: space-between;
+        flex-direction: column;
+        justify-content: center;
         align-items: center;
 
-        .el-button {
-          font-size: 16px;
-          padding: 5px 50px;
+        .select-hospital-box {
+            position: absolute;
+            top: 25px;
+            right: 25px;
+
+            .select-hospital {
+                width: 12rem;
+                margin-right: 20px;
+            }
         }
 
-        & > span {
-          cursor: pointer;
-          font-size: 18px;
-          color: #909399;
+        .logo {
+            height: 70px;
+        }
+
+        .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;
+
+                span {
+                    cursor: pointer;
+                    margin-right: 10px;
+                }
+
+                .active {
+                    color: $main-color;
+                    font-weight: 600;
+                }
+            }
+
+            .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-group__append {
+                        position: relative;
+
+                        &::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;
+                    }
+                }
+
+                .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;
+            }
+
+            .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;
+
+            .header-box {
+                display: flex;
+                justify-content: space-between;
+                margin-bottom: 30px;
+
+                .title {
+                    font-size: 20px;
+                    color: $main-color;
+                    font-weight: 600;
+                }
+
+                .el-icon {
+                    cursor: pointer;
+                }
+            }
+
+            .footer-box {
+                padding-left: 100px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+
+                .el-button {
+                    font-size: 16px;
+                    padding: 5px 50px;
+                }
+
+                & > span {
+                    cursor: pointer;
+                    font-size: 18px;
+                    color: #909399;
+                }
+            }
         }
-      }
     }
-  }
 
 }
 </style>
diff --git a/src/views/logs-manage/index.vue b/src/views/logs-manage/index.vue
index 8d0cdf9..a7b0b4a 100644
--- a/src/views/logs-manage/index.vue
+++ b/src/views/logs-manage/index.vue
@@ -1,78 +1,84 @@
 <template>
-  <div class="permissions-manage-page">
-    <div class="menu-box">
-      <CommonMenu :menuData="menuData" @selectMenu="selectMenu"/>
-    </div>
-    <div class="content-box">
-      <!-- <div class="header-box">
-          <PageTabs ref="pageTabsRef" />
-      </div> -->
-      <div class="main-box">
-        <div class="background-block">
-          <RouterView/>
+    <div class="permissions-manage-page">
+        <div class="menu-box">
+            <CommonMenu :menuData="menuData" @selectMenu="selectMenu"/>
+        </div>
+        <div class="content-box">
+            <!-- <div class="header-box">
+                <PageTabs ref="pageTabsRef" />
+            </div> -->
+            <div class="main-box">
+                <div class="background-block">
+                    <RouterView/>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang='ts' setup>
-import {onMounted, reactive, ref, toRefs, watch} from 'vue'
+import {onMounted, ref} from 'vue'
 import type {MenuItem} from '@/utils/public-interface'
 import CommonMenu from '@/components/common-menu.vue'
-import PageTabs from '@/components/page-tabs.vue'
+import {useUserStore} from "@/stores/user-info-store";
+import {useRoute, useRouter} from "vue-router";
 
-const menuData = [
-  {name: '消息管理', path: '/logs-manage/message-manage'},
-  {name: '日志管理', path: '/logs-manage/logs-manage'},
-  {name: "词典管理", path: '/logs-manage/dict-manage'}
-]
-
-const pageTabsRef = ref()
+const router = useRouter()
+const route = useRoute()
+const menuData = ref([])
 const selectMenu = (e: MenuItem) => {
-  // pageTabsRef.value.setTab(e)
+    // pageTabsRef.value.setTab(e)
 }
+
+onMounted(async () => {
+    const paths = route.path.split("/")
+    const e: any = await useUserStore().getMenuChild("/" + paths[1])
+    menuData.value = e
+    if (e && e.length > 0) {
+        router.push(e[0].path)
+    }
+})
 </script>
 
 <style lang='scss' scoped>
 .permissions-manage-page {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  overflow-y: auto;
-
-  .menu-box {
-    width: 200px;
+    width: 100%;
     height: 100%;
-    background: white;
-    overflow-x: hidden;
+    display: flex;
     overflow-y: auto;
-  }
 
-  .content-box {
-    width: calc(100% - 200px);
-    height: 100%;
-
-    .header-box {
-      width: 100%;
-      height: 50px;
-    }
-
-    .main-box {
-      width: 100%;
-      // height: calc(100% - 50px);
-      height: 100%;
-      padding: 10px;
-
-      .background-block {
-        width: 100%;
+    .menu-box {
+        width: 200px;
         height: 100%;
         background: white;
-        border-radius: 15px;
-        padding: 20px;
-        min-height: 510px;
-
-      }
+        overflow-x: hidden;
+        overflow-y: auto;
+    }
+
+    .content-box {
+        width: calc(100% - 200px);
+        height: 100%;
+
+        .header-box {
+            width: 100%;
+            height: 50px;
+        }
+
+        .main-box {
+            width: 100%;
+            // height: calc(100% - 50px);
+            height: 100%;
+            padding: 10px;
+
+            .background-block {
+                width: 100%;
+                height: 100%;
+                background: white;
+                border-radius: 15px;
+                padding: 20px;
+                min-height: 510px;
+
+            }
+        }
     }
-  }
 }</style>
diff --git a/src/views/permissions-manage/doctor-manage.vue b/src/views/permissions-manage/doctor-manage.vue
index 8c90344..dbeaecf 100644
--- a/src/views/permissions-manage/doctor-manage.vue
+++ b/src/views/permissions-manage/doctor-manage.vue
@@ -24,9 +24,12 @@
 				<el-table-column type="index" label="#" width="55" align="center"/>
 				<el-table-column property="name" label="姓名" width="120" align="center"/>
 				<el-table-column label="手机号" width="220" align="center">
-					<template #default="scope">{{
-							scope.row.phone.slice(0, 3) + '****' + scope.row.phone.slice(7)
-						}}
+					<template #default="scope">
+                        <div v-if="scope.row.phone">
+                            {{
+                                scope.row.phone.slice(0, 3) + '****' + scope.row.phone.slice(7)
+                            }}
+                        </div>
 					</template>
 				</el-table-column>
 				<el-table-column label="角色" width="220" align="center">
@@ -170,7 +173,7 @@ const resetPassword = (e: any) => {
 	ElMessageBox.prompt('是否确定要重置密码？', '系统提醒', {
 		type: 'warning',
 		draggable: true,
-		inputPattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z\s]).{9,15}$/,
+		// inputPattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z\s]).{9,15}$/,
 		inputErrorMessage: "密码至少包含字母、数字、特殊字符，不少于9位，最多15位"
 	}).then((inputVal) => {
 		modifyPw({
diff --git a/src/views/permissions-manage/form/doctor-form.vue b/src/views/permissions-manage/form/doctor-form.vue
index cf8e695..ca2dada 100644
--- a/src/views/permissions-manage/form/doctor-form.vue
+++ b/src/views/permissions-manage/form/doctor-form.vue
@@ -1,62 +1,68 @@
 <template>
-	<el-form ref="formRef" :model="formData" :rules="rules" label-width="80">
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="用户名" prop="username">
-					<el-input v-model="formData.username" placeholder="请输入用户名"
-										:disabled="type === 'edit'"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="formData.name" placeholder="请输入姓名"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="角色" prop="role">
-					<el-select v-model="formData.role" placeholder="请选择角色" multiple>
-						<el-option v-for="item in roleOption" :key="item.roleId" :label="item.roleName"
-											 :value="item.roleId"/>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="邮箱" prop="email">
-					<el-input v-model="formData.email" placeholder="请输入邮箱"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row>
-			<el-col :span="12">
-				<el-form-item label="电话" prop="phone">
-					<el-input v-model="formData.phone" placeholder="请输入电话"></el-input>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12" v-if="type != 'edit'">
-				<el-form-item label="锁定" prop="lockFlag">
-					<el-radio-group v-model="formData.lockFlag">
-						<el-radio :label="'0'" border>解锁</el-radio>
-						<el-radio :label="'1'" border>锁定</el-radio>
-					</el-radio-group>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row v-if="type != 'edit'">
-			<el-col :span="12">
-				<el-form-item label="密码" prop="password">
-					<el-input v-model="formData.password" placeholder="请输入密码"
-										:disabled="type === 'edit'"></el-input>
-				</el-form-item>
-			</el-col>
-		</el-row>
+    <el-form ref="formRef" :model="formData" :rules="rules" label-width="80">
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="用户名" prop="username">
+                    <el-input v-model="formData.username" placeholder="请输入用户名2~16位字母或数字（区分大小写）"
+                              :disabled="type === 'edit'"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="formData.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="角色" prop="role">
+                    <el-select v-model="formData.role" placeholder="请选择角色" multiple>
+                        <el-option v-for="item in roleOption" :key="item.roleId" :label="item.roleName"
+                                   :value="item.roleId"/>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="邮箱" prop="email">
+                    <el-input v-model="formData.email" placeholder="请输入邮箱"></el-input>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+                <el-form-item label="电话" prop="phone">
+                    <el-input v-model="formData.phone" placeholder="请输入电话"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="type != 'edit'">
+                <el-form-item label="锁定" prop="lockFlag">
+                    <el-radio-group v-model="formData.lockFlag">
+                        <el-radio :label="'0'" border>解锁</el-radio>
+                        <el-radio :label="'1'" border>锁定</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row v-if="type != 'edit'">
+            <el-col :span="12">
+                <el-form-item label="密码" prop="password">
+                    <el-input v-model="formData.password" placeholder="请输入密码8~16位字母或数字（区分大小写）"
+                              :disabled="type === 'edit'" type="password" show-password></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="确认密码" prop="confirmPassword">
+                    <el-input v-model="formData.confirmPassword" placeholder="请输入密码8~16位字母或数字（区分大小写）"
+                              :disabled="type === 'edit'" type="password" show-password></el-input>
+                </el-form-item>
+            </el-col>
+        </el-row>
 
-		<div style="text-align: right;padding-top: 80px;">
-			<el-button class="f18" @click="close">取消</el-button>
-			<el-button class="f18" type="primary" @click="saveData">确认</el-button>
-		</div>
-	</el-form>
+        <div style="text-align: right;padding-top: 80px;">
+            <el-button class="f18" @click="close">取消</el-button>
+            <el-button class="f18" type="primary" @click="saveData">确认</el-button>
+        </div>
+    </el-form>
 </template>
 
 <script lang='ts' setup>
@@ -68,139 +74,165 @@ import {addUser, updateUI} from "@/api/user";
 const emit = defineEmits(['close', 'save'])
 
 const props = defineProps({
-	type: String
+    type: String
 })
 
 const roleOption = ref<any>([])
 
 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 (!isPhone.test(value)) {
-		callback(new Error('请输入合法手机号'));
-	} else {
-		callback();
-	}
+    if (value.indexOf('****') >= 0) {
+        return callback().trim();
+    }
+    if (!isPhone.test(value)) {
+        callback(new Error('请输入合法手机号'));
+    } else {
+        callback();
+    }
 
 }
 
 const rules = reactive({
-	username: [
-		{required: true, message: '请输入用户名', trigger: ['blur', 'change']},
-	],
-	name: [
-		{required: true, message: '请输入姓名', trigger: ['blur', 'change']},
-	],
-	role: [
-		{required: true, message: '请选择角色', trigger: ['blur', 'change']},
-	],
-	phone: [
-		{required: true, validator: validatorPhone, trigger: ['blur', 'change']},
-	],
-	password: [
-		{required: true, message: '请输入密码', trigger: ['blur', 'change']},
-	]
+    username: [
+        {required: true, message: '请输入用户名', trigger: ['blur', 'change']},
+        {validator: validateAccount, trigger: ['blur', 'change']}
+    ],
+    name: [
+        {required: true, message: '请输入姓名', trigger: ['blur', 'change']},
+    ],
+    role: [
+        {required: true, message: '请选择角色', trigger: ['blur', 'change']},
+    ],
+    phone: [
+        {required: true, validator: validatorPhone, trigger: ['blur', 'change']},
+    ],
+    password: [
+        {required: true, message: '请输入密码', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
+    ],
+    confirmPassword: [
+        {required: true, message: '请输入密码', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
+    ]
 })
 
 const formRef = ref()
 const formData = ref({
-	id: '',
-	username: '',
-	name: '',
-	role: [],
-	email: '',
-	phone: '',
-	password: '',
-	lockFlag: '0',
+    id: '',
+    username: '',
+    name: '',
+    role: [],
+    email: '',
+    phone: '',
+    password: '',
+    confirmPassword: '',
+    lockFlag: '0',
 } as any)
 
 onMounted(() => {
-	resetData()
+    resetData()
 })
 
 getRoleList().then((res: any) => {
-	if (res && res.code == 0) {
-		roleOption.value = res.data
-	} else {
-		ElMessage.error('角色列表获取失败')
-	}
+    if (res && res.code == 0) {
+        roleOption.value = res.data
+    } else {
+        ElMessage.error('角色列表获取失败')
+    }
 })
 
 defineExpose({
-	formData,
-	resetData,
+    formData,
+    resetData,
 })
 
+function validatePass2(rule: any, value: any, callback: any) {
+    if (!(/^[a-zA-Z0-9]{8,16}$/.test(value))) {
+        callback("8~16位字母或数字（区分大小写）");
+    } else if (value !== formData.value.password) {
+        callback(new Error('两次密码不一致'));
+    } else {
+        callback()
+    }
+}
+
+function validateAccount(rule: any, value: any, callback: any) {
+    if (!(/^[a-zA-Z0-9]{2,16}$/.test(value))) {
+        callback("2~16位字母或数字（区分大小写）");
+    } else {
+        callback()
+    }
+}
+
 function close() {
-	emit('close')
+    emit('close')
 }
 
 function resetData() {
-	getRoleList()
-	formRef.value.resetFields()
-	formData.value = {
-		id: '',
-		username: '',
-		name: '',
-		role: [],
-		email: '',
-		phone: '',
-		password: '',
-		lockFlag: '0',
-	}
+    getRoleList()
+    formRef.value.resetFields()
+    formData.value = {
+        id: '',
+        username: '',
+        name: '',
+        role: [],
+        email: '',
+        phone: '',
+        password: '',
+        confirmPassword: '',
+        lockFlag: '0',
+    }
 }
 
 const saveData = async () => {
-	await formRef.value.validate((valid: any, fields: any) => {
-		if (valid) {
-			if (props.type == "add") {
-				addUser(formData.value).then((data: any) => {
-					if (data.code == 0) {
-						ElMessage.success('保存成功！')
-						emit('save', formData.value, props.type)
-						close()
-					} else {
-						ElMessage.error("保存失败")
-					}
-				})
-			} else {
-				updateUI({
-					userId: formData.value.userId,
-					username: formData.value.username,
-					name: formData.value.name,
-					role: formData.value.role,
-					email: formData.value.email,
-					phone: formData.value.phone
-				}).then((data: any) => {
-					if (data.code == 0) {
-						ElMessage.success('修改成功！')
-						emit('save', formData.value, props.type)
-						close()
-					} else {
-						ElMessage.error("修改失败")
-					}
-				})
-			}
-		}
-	})
+    await formRef.value.validate((valid: any, fields: any) => {
+        if (valid) {
+            if (props.type == "add") {
+                addUser(formData.value).then((data: any) => {
+                    if (data.code == 0) {
+                        ElMessage.success('保存成功！')
+                        emit('save', formData.value, props.type)
+                        close()
+                    } else {
+                        ElMessage.error("保存失败")
+                    }
+                })
+            } else {
+                updateUI({
+                    userId: formData.value.userId,
+                    username: formData.value.username,
+                    name: formData.value.name,
+                    role: formData.value.role,
+                    email: formData.value.email,
+                    phone: formData.value.phone
+                }).then((data: any) => {
+                    if (data.code == 0) {
+                        ElMessage.success('修改成功！')
+                        emit('save', formData.value, props.type)
+                        close()
+                    } else {
+                        ElMessage.error("修改失败")
+                    }
+                })
+            }
+        }
+    })
 }
 </script>
 
 <style lang='scss' scoped>
 :deep(.el-form-item) {
-	.el-form-item__label {
-		display: block;
-		text-align: justify;
-		text-align-last: justify;
-		padding: 0 10px 0 20px;
+    .el-form-item__label {
+        display: block;
+        text-align: justify;
+        text-align-last: justify;
+        padding: 0 10px 0 20px;
 
-		&:before {
-			display: none;
-		}
-	}
+        &:before {
+            display: none;
+        }
+    }
 }
 </style>
diff --git a/src/views/permissions-manage/index.vue b/src/views/permissions-manage/index.vue
index e262c95..fa6b314 100644
--- a/src/views/permissions-manage/index.vue
+++ b/src/views/permissions-manage/index.vue
@@ -1,15 +1,15 @@
 <template>
     <div class="permissions-manage-page">
         <div class="menu-box">
-            <CommonMenu :menuData="menuData" @selectMenu="selectMenu" />
+            <CommonMenu :menuData="menuData" @selectMenu="selectMenu"/>
         </div>
         <div class="content-box">
             <div class="header-box">
-                <PageTabs ref="pageTabsRef" />
+                <PageTabs ref="pageTabsRef"/>
             </div>
             <div class="main-box">
                 <div class="background-block">
-                    <RouterView />
+                    <RouterView/>
                 </div>
             </div>
         </div>
@@ -17,21 +17,31 @@
 </template>
 
 <script lang='ts' setup>
-import {ref} from 'vue'
+import {onMounted, ref} from 'vue'
 import type {MenuItem} from '@/utils/public-interface'
 import CommonMenu from '@/components/common-menu.vue'
 import PageTabs from '@/components/page-tabs.vue'
+import {useRoute, useRouter} from "vue-router";
+import {useUserStore} from "@/stores/user-info-store";
 
-const menuData = [
-    { name: '医生管理', path: '/permissions-manage/doctor-manage' },
-    { name: '角色管理', path: '/permissions-manage/role-manage' },
-    { name: '菜单管理', path: '/permissions-manage/menu-manage' }
-]
+const router = useRouter()
+const route = useRoute();
+const menuData = ref([])
 
 const pageTabsRef = ref()
 const selectMenu = (e: MenuItem) => {
     pageTabsRef.value.setTab(e)
 }
+
+onMounted(async () => {
+    const paths = route.path.split("/")
+    const e: any = await useUserStore().getMenuChild("/" + paths[1])
+    menuData.value = e
+    if (e && e.length > 0) {
+        router.push(e[0].path)
+    }
+})
+
 </script>
 
 <style lang='scss' scoped>
@@ -61,6 +71,7 @@ const selectMenu = (e: MenuItem) => {
             width: 100%;
             height: calc(100% - 50px);
             padding: 10px;
+
             .background-block {
                 width: 100%;
                 height: 100%;
diff --git a/src/views/permissions-manage/role-manage.vue b/src/views/permissions-manage/role-manage.vue
index 65c3cb9..a5e3a40 100644
--- a/src/views/permissions-manage/role-manage.vue
+++ b/src/views/permissions-manage/role-manage.vue
@@ -127,7 +127,8 @@ const importData = () => {
   }, 0);
 }
 const removeData = (e?: any) => {
-  const selectRow = [e] || tableRef.value.getSelectionRows();
+  const selectRow = e ? [e] : tableRef.value.getSelectionRows();
+  console.log(selectRow)
   tableRemoveRow({data: selectRow}, (res: boolean) => {
     if (res) {
       const ids: any = [];
diff --git a/src/views/remote-manage/chart/chart-line.vue b/src/views/remote-manage/chart/chart-line.vue
index c4fe8b5..a428332 100644
--- a/src/views/remote-manage/chart/chart-line.vue
+++ b/src/views/remote-manage/chart/chart-line.vue
@@ -46,7 +46,7 @@ function updateChartData(data: any) {
         xData.push(dateFormater("HH:mm:ss", item.Time));
         series.forEach((serie: any) => {
           serie.data.shift();
-          serie.data.push(item[serie.name]);
+          serie.data.push(item[serie.name])
           if (item[serie.name + '_except']) {
             emit("exceptionEvent", remoteWsStore.exceptionMsg[serie.name + '_except'], item.Time);
           }
diff --git a/src/views/remote-manage/part/remote-item-part.vue b/src/views/remote-manage/part/remote-item-part.vue
index b73702b..698b614 100644
--- a/src/views/remote-manage/part/remote-item-part.vue
+++ b/src/views/remote-manage/part/remote-item-part.vue
@@ -70,6 +70,7 @@ const remoteWsStore = useRemoteWsStore();
 const remoteTask = ref(remoteWsStore.remoteTasks[props.index]);
 const patientInfo = ref({} as any)
 let reconnectTime = 0
+let currentException: any = {}
 
 onMounted(() => {
     // 连接成功执行查询
@@ -115,17 +116,20 @@ function wsClose() {
 }
 
 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);
-        }
-    })
+    if (currentException[index]?.Time != data.Time) {
+        currentException[index] = data
+        remoteWsStore.exceptionType.forEach((item: any) => {
+            if (data[item]) {
+                const msg: any = remoteWsStore.exceptionMsg[item];
+                remoteWsStore.setRemoteLog({
+                    state: msg,
+                    taskName: remoteTask.value.taskName,
+                    time: data.Time,
+                    type: "exception"
+                }, index);
+            }
+        })
+    }
 }
 
 </script>
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index d04ed1e..b7b0516 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -110,7 +110,7 @@
               </template> -->
                         </el-table-column>
                         <el-table-column prop="total" label="累计药量(ml)" width="100"/>
-<!--                        <el-table-column prop="state" label="工作状态" width="150" align="center"/>-->
+                        <!--                        <el-table-column prop="state" label="工作状态" width="150" align="center"/>-->
                         <!--            <el-table-column label="特殊情况人为干预" align="center">
                                       <template #default="scope">
                                         <div class="table-btn-box">
@@ -143,7 +143,7 @@
                         <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"/>
-<!--                        <el-table-column prop="state" label="工作状态" width="150" align="center"/>-->
+                        <!--                        <el-table-column prop="state" label="工作状态" width="150" align="center"/>-->
                         <!-- <el-table-column label="特殊情况人为干预" align="center">
                           <template #default="scope">
                             <div class="table-btn-box">
@@ -281,12 +281,18 @@ function subscribeWS() {
                 chartDom2.value.updateChartData(data.vitalSignsList);
                 chartDom3.value.updateChartData(data.vitalSignsList);
                 // chartDom4.value.updateChartData(data.vitalSignsList);
-                updateMedicineTable(data.aiMedicineList[0], data.docMedicineList[0]);
+                // updateMedicineTable(data.aiMedicineList[0], data.docMedicineList[0]);
+                updateMedicineTable(data.aiMedicineList[0], undefined);
             })
 
     remoteWsStore.subscribeChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index,
             function (res: any) {
-                mssageList.value.push(JSON.parse(res.data));
+                const chatObj = JSON.parse(res.data);
+                if (chatObj.history) {
+                    mssageList.value = chatObj.history;
+                } else {
+                    mssageList.value.push(JSON.parse(res.data));
+                }
             })
 
     /*remoteWsStore.subscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index,
@@ -331,27 +337,35 @@ function updateMedicineTable(aiMedicine: any, doctorMedicine: any) {
         })
         if (varTableData.value.length > 0) {
             varTableData.value.forEach((medicine: any) => {
-                medicine.speed = aiMedicine[medicine.name];
+                medicine.speed = aiMedicine[medicine.name] ? Number(aiMedicine[medicine.name]).toFixed(2) : '0.0'
+                medicine.total = aiMedicine[medicine.name + "sum"] ? Number(aiMedicine[medicine.name + "sum"]).toFixed(2) : '0.0'
             })
             fixedTableData.value.forEach((medicine: any) => {
-                medicine.speed = aiMedicine[medicine.name];
+                medicine.speed = aiMedicine[medicine.name] ? Number(aiMedicine[medicine.name]).toFixed(2) : '0.0'
+                medicine.total = aiMedicine[medicine.name + "sum"] ? Number(aiMedicine[medicine.name + "sum"]).toFixed(2) : '0.0'
             })
         } else {
             const varTable: any = [];
             const fixedTable: any = [];
-            keys.forEach(key => {
+            remoteWsStore.varMedicine.forEach(key => {
                 const medicine = {
                     Phase: 0,
                     name: key,
-                    speed: aiMedicine[key],
-                    total: aiMedicine[key + "sum"],
+                    speed: aiMedicine[key] ? Number(aiMedicine[key]).toFixed(2) : '0.0',
+                    total: aiMedicine[key + "sum"] ? Number(aiMedicine[key + "sum"]).toFixed(2) : '0.0',
                     state: "正常"
                 }
-                if (remoteWsStore.varMedicine.includes(key)) {
-                    varTable.push(medicine);
-                } else if (remoteWsStore.fixedMedicine.includes(key)) {
-                    fixedTable.push(medicine);
+                varTable.push(medicine);
+            })
+            remoteWsStore.fixedMedicine.forEach(key => {
+                const medicine = {
+                    Phase: 0,
+                    name: key,
+                    speed: aiMedicine[key] ? Number(aiMedicine[key]).toFixed(2) : '0.0',
+                    total: aiMedicine[key + "sum"] ? Number(aiMedicine[key + "sum"]).toFixed(2) : '0.0',
+                    state: "正常"
                 }
+                fixedTable.push(medicine);
             })
             varTableData.value = varTable;
             fixedTableData.value = fixedTable;
diff --git a/src/views/system-manage/user-list.vue b/src/views/system-manage/user-list.vue
index 6de8f8e..0a154f2 100644
--- a/src/views/system-manage/user-list.vue
+++ b/src/views/system-manage/user-list.vue
@@ -21,7 +21,7 @@
                 <el-table-column property="name" label="姓名" width="120" align="center" />
                 <el-table-column label="手机号" width="220" align="center">
                     <template #default="scope">{{
-                        scope.row.phone.slice(0, 3) + '****' + scope.row.phone.slice(7)
+                        scope.row.phone?.slice(0, 3) + '****' + scope.row.phone?.slice(7)
                         }}
                     </template>
                 </el-table-column>