From d85465d8598c03706a2ae43beb711098eaa2c43d Mon Sep 17 00:00:00 2001 From: yanzai Date: Wed, 16 Jul 2025 15:47:19 +0800 Subject: [PATCH] =?UTF-8?q?HIS=E7=9B=B4=E6=8E=A5=E7=99=BB=E5=BD=95=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=A1=AB=E5=86=99=E5=8C=BB=E7=94=9F=E5=92=8C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=82=A3=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/His/UserController.php | 2 +- Laravel/routes/web.php | 3 +- YiJi-admin/src/stores/index.js | 10 ++-- YiJi-admin/src/views/HisLogin.vue | 1 + YiJi-admin/src/views/Index.vue | 6 ++- YiJi-admin/src/views/YeWu/MainList.vue | 51 ++++++++++++++++--- 6 files changed, 60 insertions(+), 13 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/His/UserController.php b/Laravel/app/Http/Controllers/API/His/UserController.php index 5a39416..b2046e5 100644 --- a/Laravel/app/Http/Controllers/API/His/UserController.php +++ b/Laravel/app/Http/Controllers/API/His/UserController.php @@ -28,7 +28,7 @@ class UserController extends Controller if($data_v['levelName']=='护士'){ $group=3; }else{ - $group=3;//其余的都给护士权限 + $group=7;//其余的都给医生权限 } } if (!$user) { diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index f652759..543ba6e 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -15,7 +15,8 @@ use Illuminate\Support\Facades\Route; */ Route::get('/', function () { - return view('welcome'); + return redirect('http://192.168.80.76/admin/#/login'); + // return view('welcome'); }); //微信登录授权获取code diff --git a/YiJi-admin/src/stores/index.js b/YiJi-admin/src/stores/index.js index eac9e1a..a151e61 100644 --- a/YiJi-admin/src/stores/index.js +++ b/YiJi-admin/src/stores/index.js @@ -7,8 +7,12 @@ export const usePinia = defineStore('usePinia', () => { const themeChange=(v)=>{ theme.value=v } + + //获取基本信息状态 + let baseInfoStatus=ref(false); + const baseInfoStatusChange=(status)=>{ + baseInfoStatus.value=status + } - - - return { theme,themeChange} + return { theme,themeChange,baseInfoStatus,baseInfoStatusChange} }) diff --git a/YiJi-admin/src/views/HisLogin.vue b/YiJi-admin/src/views/HisLogin.vue index 36df8e6..e24a1ee 100644 --- a/YiJi-admin/src/views/HisLogin.vue +++ b/YiJi-admin/src/views/HisLogin.vue @@ -24,6 +24,7 @@ if(res.status){ sessionStorage.setItem('token', res.data.access_token); sessionStorage.setItem('refreshToken', res.data.refresh_token); + sessionStorage.setItem('default_reg_num', getParameterByName('cardno'));//设置默认查询患者id // sessionStorage.setItem('tk', JSON.stringify(res.data.tk)); var token = sessionStorage.getItem('token'); console.log(token) diff --git a/YiJi-admin/src/views/Index.vue b/YiJi-admin/src/views/Index.vue index 81b4064..5b52948 100644 --- a/YiJi-admin/src/views/Index.vue +++ b/YiJi-admin/src/views/Index.vue @@ -160,6 +160,7 @@ const route = useRoute() const router = useRouter() + const pinia = usePinia() watch(() => router.currentRoute.value, (newVal, oldVal) => { @@ -219,10 +220,10 @@ }) const getBaseAdminUserInfo = () => { GetBaseAdminUserInfo().then(res => { + pinia.baseInfoStatusChange(true) BaseUserInfo.value = res.info[0] sessionStorage.setItem('LoginUserInfo', JSON.stringify(res.info[0])) BaseUserInfo.value.img = import.meta.env.VITE_APP_FILE + BaseUserInfo.value.img - console.log(route.path) let BingQu = [2]; //跳转住院主工作列表 let QiTa = [3]; //跳转普通主工作列表 let Guanli = [1, 5]; //管理员 @@ -257,9 +258,10 @@ let activeMenu = ref(''); onMounted(() => { + getBaseAdminUserInfo() menuList() GetConfig() - getBaseAdminUserInfo() + activeMenu.value = router.currentRoute.value.path }) diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue index b822349..f0c39d9 100644 --- a/YiJi-admin/src/views/YeWu/MainList.vue +++ b/YiJi-admin/src/views/YeWu/MainList.vue @@ -281,7 +281,7 @@ import { ref, onMounted, - nextTick + nextTick,watch } from 'vue' import { @@ -293,12 +293,18 @@ GetLoglist, CheckEntrstItemGroup,getMainDetail,SignIn,CancelSign } from '@/api/api.js' + import { + usePinia + } from '@/stores/index.js' import { ElMessage, ElMessageBox } from 'element-plus' import ShenQingDan from '@/components/Yewu/PrintShenQingDan.vue' import YuYue202506 from '@/components/Yewu/YuYue202506.vue' + + let pinia = usePinia() + let YuYueVueDialogVisible=ref(false); let YuYueKey=ref(0); let AutoGroup=ref(true);//自动分组是否开启 @@ -634,9 +640,7 @@ } let loginUserinfo=ref(null); - if(sessionStorage.getItem("LoginUserInfo")){ - loginUserinfo.value=JSON.parse(sessionStorage.getItem("LoginUserInfo")) - } + //打印申请单 let print_shenqingdan_button=ref(null); let shenqingdan_list=ref([]) @@ -750,12 +754,47 @@ } }) } - onMounted(() => { + const getStorageData=()=>{ + if(sessionStorage.getItem("LoginUserInfo")){ + loginUserinfo.value=JSON.parse(sessionStorage.getItem("LoginUserInfo")) + } if(loginUserinfo.value && loginUserinfo.value.group!=2){ getEnableResource() } + //如果是医生，默认填入搜索医生 + if(loginUserinfo.value && loginUserinfo.value.group==7){ + searchInfo.value.doctor=loginUserinfo.value.cn_name + //填入默认查询体检人 + let default_reg_num=sessionStorage.getItem("default_reg_num") + if(default_reg_num && default_reg_num!='null' && default_reg_num!=''){ + searchInfo.value.reg_num=default_reg_num + } + } + + + } + onMounted(() => { + GetEnableDeviceListFunc() - GetServiceDate() + if(pinia.baseInfoStatus){ + getStorageData() + GetServiceDate() + }else{ + const unwatch = watch( + () => pinia.baseInfoStatus, + (newVal) => { + if (newVal) { + console.log(newVal) + console.log('66666',loginUserinfo.value) + + getStorageData() + GetServiceDate() + unwatch(); // 停止监听 + } + } + ); + } + })