diff --git a/src/App.vue b/src/App.vue index 725fd97..44ab1f5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,23 +5,12 @@ diff --git a/src/api/regional/hospital.ts b/src/api/regional/hospital.ts deleted file mode 100644 index 68c5b4d..0000000 --- a/src/api/regional/hospital.ts +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询医疗机构列表 -export function listhospital(query?: Object) { - return request({ - url: '/transitdict/hospital/list', - method: 'get', - params: query - }) -} - -// 查询医疗机构详细 -export function gethospital(hospitalId: number) { - return request({ - url: '/transitdict/hospital/' + hospitalId, - method: 'get' - }) -} - -// 新增医疗机构 -export function addhospital(data: Object) { - return request({ - url: '/transitdict/hospital', - method: 'post', - data: data - }) -} - -// 修改医疗机构 -export function updatehospital(data: Object) { - return request({ - url: '/transitdict/hospital', - method: 'put', - data: data - }) -} - -// 删除医疗机构 -export function delhospital(hospitalId: number) { - return request({ - url: '/transitdict/hospital/' + hospitalId, - method: 'delete' - }) -} diff --git a/src/api/system/medicalInstitutions.ts b/src/api/system/medicalInstitutions.ts new file mode 100644 index 0000000..28a9762 --- /dev/null +++ b/src/api/system/medicalInstitutions.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 获取医疗机构列表 +export function queryHosList(query?: Object) { + return request({ + url: '/bus/bloodbank/hosInfo/queryList', + method: 'get', + params: query + }) +} +// 新增机构 +export function addHos(query?: Object) { + return request({ + url: '/bus/bloodbank/hosInfo/add', + method: 'post', + data: query + }) +} +// 修改机构 +export function upadteHos(query?: Object) { + return request({ + url: '/bus/bloodbank/hosInfo/update', + method: 'post', + data: query + }) +} \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index a09b563..feb531b 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -122,6 +122,13 @@ aside { //main-container全局样式 .app-container { + padding: 10px; + height: calc(100vh - 5.25rem); + background-color: #fff; + box-sizing: border-box; +} + +.box-container { padding: 10px 10px 0 10px; height: calc(100vh - 5.25rem); background-color: #e6edf9; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 5e1c463..485baf6 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -51,7 +51,7 @@ import RuoYiDoc from '@/components/RuoYi/Doc/index.vue' import useAppStore from '@/store/modules/app' import useUserStore from '@/store/modules/user' import useSettingsStore from '@/store/modules/settings' -import { listhospital } from '@/api/regional/hospital' +import { queryHosList, addHos, upadteHos } from '@/api/system/medicalInstitutions' const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() @@ -133,8 +133,8 @@ async function toggleTheme(event?: MouseEvent): Promise { } onMounted(() => { - listhospital({ pageSize: 100, pageNum: 1 }).then((resp: any) => { - yljgName.value = resp.rows.find((item: any) => item.hospitalId == userStore.sysLoginParam.loginYLJG)?.hospitalName || '输血平台' + queryHosList().then((resp) => { + yljgName.value = resp.data.find((item) => item.hospital_code == userStore.sysLoginParam.loginYLJG)?.hospital_name || '输血平台' }) }) diff --git a/src/layout/index.vue b/src/layout/index.vue index fc98324..0f3b2f4 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -19,6 +19,15 @@ import Sidebar from './components/Sidebar/index.vue' import { AppMain, Navbar, Settings, TagsView } from './components' import useAppStore from '@/store/modules/app' import useSettingsStore from '@/store/modules/settings' +import { useSysParam } from '@/hooks/useSysParam' + +const { initAllParams } = useSysParam() + +// ========== 在这里统一维护【所有需要全局获取的参数 key】 ========== +const GLOBAL_PARAM_KEYS = [ + 'YBZFXMTSXX', // YBZFXMTSXX + 'HZBQGY', // 患者病情概要是否必填 +] const settingsStore = useSettingsStore() const theme = computed(() => settingsStore.theme) @@ -60,6 +69,12 @@ const settingRef = ref(null) function setLayout() { settingRef.value.openSetting() } + +onMounted(() => { + + // 获取参数值 + initAllParams(GLOBAL_PARAM_KEYS) +}) \ No newline at end of file