菜单动态展示

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: [
           {

src/stores/user-info-store.ts

@@ -63,8 +63,19 @@ export const useUserStore = defineStore('login', {
                     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) {

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: "取消",

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">
@@ -26,7 +26,8 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="password">
-              <el-input v-model="loginParams.password" type="password" show-password placeholder="请输入密码">
+                            <el-input v-model="loginParams.password" type="password" show-password
+                                      placeholder="请输入密码">
                                 <template #prepend>
                                     <el-icon>
                                         <Lock/>
@@ -34,7 +35,8 @@
                                 </template>
                             </el-input>
                         </el-form-item>
-            <el-button :loading="loading" class="login-btn" type="primary" @click="login('password')">登录</el-button>
+                        <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>
@@ -80,11 +82,15 @@
 
                 <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-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="请输入密码"></el-input>
+                                  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>
@@ -164,13 +170,9 @@ const validatorPhone = (rule: any, value: any, callback: any) => {
 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'},
+        {required: true, message: '请输入用户名', trigger: 'change'},
-    {min: 5, max: 25, message: '长度在 5 到 25个字符'},
-    {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
     ],
     phone: [
         {required: true, validator: validatorPhone, trigger: 'blur'},
@@ -181,14 +183,16 @@ const loginRules = reactive({
 })
 const registerRules = reactive({
     username: [
-    {required: true, message: '请输入用户名', trigger: 'change'},
+        {required: true, message: '用户名不能为空', trigger: ['blur', 'change']},
-    {min: 2, max: 18, message: "长度在 6 到 18个字符"},
+        {validator: validateAccount, trigger: ['blur', 'change']}
-    //{pattern:/^(?![^A-Za-z]+$)(?![^0-9]+$)[0-9A-Za-z_]{4,15}$/, message: '长度在4-15位，数字、字母、下划线的组合，其中数字和字母必须同时存在'}
     ],
     password: [
-    {required: true, message: '请输入密码', trigger: 'blur'},
+        {required: true, message: '密码不能为空', trigger: ['blur', 'change']},
-    {min: 5, max: 25, message: '长度在 5 到 25个字符'},
+        {validator: validatePass2, trigger: ['blur', 'change']}
-    {pattern: /^(\w){5,25}$/, message: '长度在5-25之间，以字母、数字、下划线'}
+    ],
+    confirmPassword: [
+        {required: true, message: '密码不能为空', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
     ],
     name: [
         {required: true, message: '请输入真实姓名', trigger: 'blur'},
@@ -211,9 +215,9 @@ const currentHospital = ref("")
 const isShowRegister = ref(false)
 const passwordLogin = ref(true)
 const loginParams = ref({
-  account: 'admin',
+    account: '',
     name: '',
-  password: '123456',
+    password: '',
     phone: '',
     phoneArea: phoneAreas[0],
     code: '',
@@ -224,6 +228,7 @@ const loginParams = ref({
 const registerParams = ref({
     username: '',
     password: '',
+    confirmPassword: '',
     name: '',
     phone: '',
     hospital: '',
@@ -250,6 +255,24 @@ onMounted(() => {
     })
 })
 
+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) => {
 }
 

src/views/logs-manage/index.vue

@@ -17,21 +17,27 @@
 </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 = [
+const router = useRouter()
-  {name: '消息管理', path: '/logs-manage/message-manage'},
+const route = useRoute()
-  {name: '日志管理', path: '/logs-manage/logs-manage'},
+const menuData = ref([])
-  {name: "词典管理", path: '/logs-manage/dict-manage'}
-]
-
-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>

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">{{
+					<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({

src/views/permissions-manage/form/doctor-form.vue

@@ -3,7 +3,7 @@
         <el-row>
             <el-col :span="12">
                 <el-form-item label="用户名" prop="username">
-					<el-input v-model="formData.username" placeholder="请输入用户名"
+                    <el-input v-model="formData.username" placeholder="请输入用户名2~16位字母或数字（区分大小写）"
                               :disabled="type === 'edit'"></el-input>
                 </el-form-item>
             </el-col>
@@ -46,8 +46,14 @@
         <el-row v-if="type != 'edit'">
             <el-col :span="12">
                 <el-form-item label="密码" prop="password">
-					<el-input v-model="formData.password" placeholder="请输入密码"
+                    <el-input v-model="formData.password" placeholder="请输入密码8~16位字母或数字（区分大小写）"
-										:disabled="type === 'edit'"></el-input>
+                              :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>
@@ -91,6 +97,7 @@ const validatorPhone = (rule: any, value: any, callback: any) => {
 const rules = reactive({
     username: [
         {required: true, message: '请输入用户名', trigger: ['blur', 'change']},
+        {validator: validateAccount, trigger: ['blur', 'change']}
     ],
     name: [
         {required: true, message: '请输入姓名', trigger: ['blur', 'change']},
@@ -103,6 +110,11 @@ const rules = reactive({
     ],
     password: [
         {required: true, message: '请输入密码', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
+    ],
+    confirmPassword: [
+        {required: true, message: '请输入密码', trigger: ['blur', 'change']},
+        {validator: validatePass2, trigger: ['blur', 'change']}
     ]
 })
 
@@ -115,6 +127,7 @@ const formData = ref({
     email: '',
     phone: '',
     password: '',
+    confirmPassword: '',
     lockFlag: '0',
 } as any)
 
@@ -135,6 +148,24 @@ defineExpose({
     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')
 }
@@ -150,6 +181,7 @@ function resetData() {
         email: '',
         phone: '',
         password: '',
+        confirmPassword: '',
         lockFlag: '0',
     }
 }

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 = [
+const router = useRouter()
-    { name: '医生管理', path: '/permissions-manage/doctor-manage' },
+const route = useRoute();
-    { name: '角色管理', path: '/permissions-manage/role-manage' },
+const menuData = ref([])
-    { name: '菜单管理', path: '/permissions-manage/menu-manage' }
-]
 
 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%;

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 = [];

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);
           }

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) {
+    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: new Date(),
+                    time: data.Time,
                     type: "exception"
                 }, index);
             }
         })
+    }
 }
 
 </script>

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) {
+                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],
+                    speed: aiMedicine[key] ? Number(aiMedicine[key]).toFixed(2) : '0.0',
-                    total: aiMedicine[key + "sum"],
+                    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);
+            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;

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>