diff --git a/.env b/.env
index 4b0f5bf6..c052e4c7 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
# 标题
-VITE_APP_TITLE=芋道管理系统
+VITE_APP_TITLE=医学影像系统
# 项目本地运行端口号
VITE_PORT=80
diff --git a/src/api/applyregistration/applyform/index.ts b/src/api/applyregistration/applyform/index.ts
index 1bae1095..792dcca0 100644
--- a/src/api/applyregistration/applyform/index.ts
+++ b/src/api/applyregistration/applyform/index.ts
@@ -91,4 +91,9 @@ export const ApplyformApi = {
batchupdateFJApplyform: async (data:UPFJApplyformVO[]) => {
return await request.post({ url: `/applyregistration/applyform/batchupdateFJ`, data})
},
+ // 同步
+ SyncDb: async (AppCode: string) => {
+ return await request.get({ url: `/applyregistration/applyform/SyncDb?AppCode=` + AppCode })
+ },
+
}
diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue
index d241130d..4bdcfd82 100644
--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
@@ -66,10 +66,10 @@ watch(
]"
to="/"
>
- <img
+ <!-- <img
class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
- src="@/assets/imgs/logo.png"
- />
+ src="@/assets/svgs/login-fly.svg"
+ /> -->
<div
v-if="show"
:class="[
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 87336181..126f0e37 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -50,7 +50,7 @@ export const useAppStore = defineStore('app', {
breadcrumb: true, // 面包屑
breadcrumbIcon: true, // 面包屑图标
collapse: false, // 折叠菜单
- uniqueOpened: true, // 是否只保持一个子菜单的展开
+ uniqueOpened: false, // 是否只保持一个子菜单的展开
hamburger: true, // 折叠图标
screenfull: true, // 全屏图标
search: true, // 搜索图标
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index c59b9d22..8d772e52 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -1,78 +1,11 @@
<template>
- <div>
- <el-card shadow="never">
- <el-skeleton :loading="loading" animated>
- <el-row :gutter="16" justify="space-between">
- <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
- <div class="flex items-center">
- <el-avatar :src="avatar" :size="70" class="mr-16px">
- <img src="@/assets/imgs/avatar.gif" alt="" />
- </el-avatar>
- <div>
- <div class="text-20px">
- {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
- </div>
- <div class="mt-10px text-14px text-gray-500">
- {{ t('workplace.toady') }}，20℃ - 32℃！
- </div>
- </div>
- </div>
- </el-col>
- <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
- <div class="h-70px flex items-center justify-end lt-sm:mt-10px">
- <div class="px-8px text-right">
- <div class="mb-16px text-14px text-gray-400">{{ t('workplace.project') }}</div>
- <CountTo
- class="text-20px"
- :start-val="0"
- :end-val="totalSate.project"
- :duration="2600"
- />
- </div>
- <el-divider direction="vertical" />
- <div class="px-8px text-right">
- <div class="mb-16px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>
- <CountTo
- class="text-20px"
- :start-val="0"
- :end-val="totalSate.todo"
- :duration="2600"
- />
- </div>
- <el-divider direction="vertical" border-style="dashed" />
- <div class="px-8px text-right">
- <div class="mb-16px text-14px text-gray-400">{{ t('workplace.access') }}</div>
- <CountTo
- class="text-20px"
- :start-val="0"
- :end-val="totalSate.access"
- :duration="2600"
- />
- </div>
- </div>
- </el-col>
- </el-row>
- </el-skeleton>
- </el-card>
- </div>
+
<el-row class="mt-8px" :gutter="8" justify="space-between">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
- <template #header>
- <div class="h-3 flex justify-between">
- <span>{{ t('workplace.project') }}</span>
- <el-link
- type="primary"
- :underline="false"
- href="https://github.com/yudaocode"
- target="_blank"
- >
- {{ t('action.more') }}
- </el-link>
- </div>
- </template>
<el-skeleton :loading="loading" animated>
+ <span style="font-size: 17px;">快捷入口</span>
<el-row>
<el-col
v-for="(item, index) in projects"
@@ -85,13 +18,9 @@
>
<el-card shadow="hover" class="mr-5px mt-5px">
<div class="flex items-center">
- <Icon :icon="item.icon" :size="25" class="mr-8px" />
- <span class="text-16px">{{ item.name }}</span>
- </div>
- <div class="mt-12px text-9px text-gray-400">{{ t(item.message) }}</div>
- <div class="mt-12px flex justify-between text-12px text-gray-400">
- <span>{{ item.personal }}</span>
- <span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
+ <router-link :to="item.message" class="menu-button flex items-center justify-center" style="width: 100%; height: 100%;">
+ <span>{{ item.name }}</span>
+ </router-link>
</div>
</el-card>
</el-col>
@@ -120,7 +49,8 @@
</el-skeleton>
</el-card>
</el-col>
- <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
+
+ <!-- <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
<template #header>
<div class="h-3 flex justify-between">
@@ -140,6 +70,7 @@
</el-row>
</el-skeleton>
</el-card>
+
<el-card shadow="never" class="mt-8px">
<template #header>
<div class="h-3 flex justify-between">
@@ -168,7 +99,7 @@
</div>
</el-skeleton>
</el-card>
- </el-col>
+ </el-col> -->
</el-row>
</template>
<script lang="ts" setup>
@@ -211,46 +142,16 @@ let projects = reactive<Project[]>([])
const getProject = async () => {
const data = [
{
- name: 'ruoyi-vue-pro',
- icon: 'akar-icons:github-fill',
- message: 'https://github.com/YunaiV/ruoyi-vue-pro',
- personal: 'Spring Boot 单体架构',
- time: new Date()
+ name: '申请记录单',
+ message: '/reservation/applyform'
},
{
- name: 'yudao-ui-admin-vue3',
- icon: 'logos:vue',
- message: 'https://github.com/yudaocode/yudao-ui-admin-vue3',
- personal: 'Vue3 + element-plus',
- time: new Date()
+ name: '超声报告',
+ message: '/diagnosis/patientexamlistultrasonic'
},
{
- name: 'yudao-ui-admin-vben',
- icon: 'logos:vue',
- message: 'https://github.com/yudaocode/yudao-ui-admin-vben',
- personal: 'Vue3 + vben(antd)',
- time: new Date()
- },
- {
- name: 'yudao-cloud',
- icon: 'akar-icons:github',
- message: 'https://github.com/YunaiV/yudao-cloud',
- personal: 'Spring Cloud 微服务架构',
- time: new Date()
- },
- {
- name: 'yudao-ui-mall-uniapp',
- icon: 'logos:vue',
- message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp',
- personal: 'Vue3 + uniapp',
- time: new Date()
- },
- {
- name: 'yudao-ui-admin-vue2',
- icon: 'logos:vue',
- message: 'https://github.com/yudaocode/yudao-ui-admin-vue2',
- personal: 'Vue2 + element-ui',
- time: new Date()
+ name: '影像报告',
+ message: '/diagnosis/patientexamlist'
}
]
projects = Object.assign(projects, data)
@@ -389,3 +290,18 @@ const getAllApi = async () => {
getAllApi()
</script>
+<style>
+.menu-button {
+ /* 按钮样式 */
+ padding: 10px 2px;
+ background: linear-gradient(141.88deg, rgb(0, 102, 235) 0%, rgb(3, 129, 255) 100%), rgb(36, 93, 209);
+ color: white;
+ text-decoration: none;
+ border-radius: 5px;
+ cursor: pointer;
+ text-align: center;
+
+
+
+}
+</style>
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 2f1491fc..a719e271 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -173,7 +173,8 @@ $prefix-cls: #{$namespace}-login;
.bottom-image
{
margin-left: 75%;
- margin-top: 30px;
+ margin-top: 15px;
+ margin-bottom: 5px;
}
/* 中间 */
.my-middle {
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 6e3279e4..3afa776a 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -15,7 +15,7 @@
<LoginFormTitle style="width: 100%;color: rgb(4, 41, 129);" />
</el-form-item>
</el-col>
- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+ <!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"
@@ -25,7 +25,7 @@
type="primary"
/>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="username">
<el-input
@@ -52,14 +52,14 @@
style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
>
<el-form-item>
- <el-row justify="space-between" style="width: 100%">
+ <el-row justify="space-between" style="width: 100%;">
<el-col :span="6">
- <el-checkbox v-model="loginData.loginForm.rememberMe">
+ <el-checkbox v-model="loginData.loginForm.rememberMe">
{{ t('login.remember') }}
</el-checkbox>
</el-col>
<el-col :offset="6" :span="12">
- <el-link style="float: right; " type="primary">{{ t('login.forgetPassword') }}</el-link>
+ <el-link style="float: right; color: rgba(74, 74, 74, 1);" type="primary">{{ t('login.forgetPassword') }}</el-link>
</el-col>
</el-row>
</el-form-item>
@@ -71,7 +71,7 @@
:title="t('login.login')"
class="w-[100%]"
type="primary"
- style="background: linear-gradient(141.88deg, rgb(0, 102, 235) 0%, rgb(3, 129, 255) 100%), rgb(36, 93, 209);"
+ style="background: linear-gradient(141.88deg, rgb(0, 102, 235) 0%, rgb(3, 129, 255) 100%), rgb(36, 93, 209); height: 40px"
@click="getCode()"
/>
</el-form-item>
@@ -353,4 +353,11 @@ onMounted(() => {
cursor: pointer;
}
}
+</style>
+
+<style>
+
+
+
+
</style>
diff --git a/src/views/applyregistration/applyform/ApplyformForm.vue b/src/views/applyregistration/applyform/ApplyformForm.vue
index ca23ebb2..f6a9fa9f 100644
--- a/src/views/applyregistration/applyform/ApplyformForm.vue
+++ b/src/views/applyregistration/applyform/ApplyformForm.vue
@@ -19,7 +19,7 @@
clearable
class="!w-300px"
>
- <el-option v-for="item in fordevicemData" :key="item.deviceId" :label="item.deviceName" :value="item.deviceName+'|'+item.deviceId" />
+ <el-option v-for="item in fordevicemData" :key="item.deviceId" :label="item.deviceName+'|'+item.deviceType+'|'+item.deviceId" :value="item.deviceName+'|'+item.deviceId" />
</el-select>
</el-form-item>
</el-form>
diff --git a/src/views/applyregistration/applyform/index.vue b/src/views/applyregistration/applyform/index.vue
index d7bca149..c35363fb 100644
--- a/src/views/applyregistration/applyform/index.vue
+++ b/src/views/applyregistration/applyform/index.vue
@@ -115,7 +115,12 @@
clearable
class="!w-200px"
>
- <el-option v-for="item in fordepartementData" :key="item.id" :label="item.departmentName" :value="item.departmentName" />
+ <el-option
+ v-for="item in fordepartementData"
+ :key="item.id"
+ :label="item.departmentName"
+ :value="item.departmentName"
+ />
<!-- <el-option label="影像科" value="影像科" /> -->
</el-select>
</el-form-item>
@@ -149,7 +154,7 @@
>
<Icon icon="ep:plus" class="mr-5px" /> 批量分检
</el-button>
- <el-button @click="resetQuery" type="primary"
+ <el-button @click="Sync" type="primary"
><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button
>
</el-form-item>
@@ -322,7 +327,7 @@ const getList = async () => {
list.value = data.list
total.value = data.total
//科室字典
- fordepartementData.value=await DepartmentApi.getDepartmentList()
+ fordepartementData.value = await DepartmentApi.getDepartmentList()
} finally {
loading.value = false
}
@@ -340,6 +345,14 @@ const resetQuery = () => {
handleQuery()
}
+// 同步操作
+const Sync = async () => {
+ const data = await ApplyformApi.SyncDb('DB001')
+ if (data) {
+ getList()
+ }
+}
+
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, pname: string, orgid: string, ID: number, status: string) => {
diff --git a/src/views/system/examitems/examitemscompareForm.vue b/src/views/system/examitems/examitemscompareForm.vue
index cde6ebc4..5daf32a1 100644
--- a/src/views/system/examitems/examitemscompareForm.vue
+++ b/src/views/system/examitems/examitemscompareForm.vue
@@ -1,7 +1,7 @@
<template>
- <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 1050px;">
+ <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 1500px;">
<div class="container">
- <div class="top">
+ <div class="left">
<!-- 列表 -->
<p style="font-weight: bold">本地列表</p>
<ContentWrap>
@@ -42,16 +42,16 @@
/>
</ContentWrap>
</div>
- <div class="middle">
+ <div class="center">
<div>
- <p style="font-weight: bold">本地列表选择：检查项目:{{ bdrow.examItemName }} </p>
- <div>
- <el-button type="success"><Icon icon="ep:refresh" class="mr-5px" /> 对照</el-button>
+ <p style="font-weight: bold; margin-top:50px; color: chocolate;">本地列表选择：检查项目:{{ bdrow.examItemName }} </p>
+ <div style="margin-left: 30px;margin-top:50px">
+ <el-button type="success"><Icon icon="ep:refresh" class="mr-5px" /> 对照</el-button>
</div>
- <div> <p style="font-weight: bold">对照列表选择：第三方检查项目名称：{{}}</p></div>
+ <div> <p style="font-weight: bold; margin-top:50px; color: red;">对照列表选择：第三方检查项目名称：{{}}</p></div>
</div>
</div>
- <div class="bottom">
+ <div class="right">
<p style="font-weight: bold">对照信息列表</p>
<!-- 列表 -->
<ContentWrap>
@@ -203,25 +203,26 @@ const resetForm = () => {
<style>
.container {
- display: flex;
- flex-direction: column;
- height: 800px; /* 使用视口高度确保撑满整个屏幕 */
- width: 1000px;
+ display: flex; /* 使用Flexbox布局 */
+ justify-content: space-between; /* 左右两侧对齐，中间留空 */
}
-
-.top,
-.bottom {
- flex-grow: 1; /* 使上下部分平分剩余空间 */
- background-color: #f0f0f0; /* 为了视觉效果 */
+.left
+{
+ width: 600px;
+}
+.right
+{
+ width: 600px;
+}
+.left, .center, .right {
+
+ /* 可以根据需要添加更多的样式 */
padding: 10px;
+ box-sizing: border-box;
}
-.middle {
- height: 80px; /* 中间部分固定高度 */
- background-color: #fff; /* 为了视觉效果 */
- padding: 20px;
- display: flex;
- justify-content: center; /* 水平居中 */
- align-items: center; /* 垂直居中 */
+/* 可以根据需要调整中间div的flex属性，使其占据更多空间 */
+.center {
+ width: 300px;
}
</style>