diff --git a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
index 34c36046..fa764298 100644
--- a/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
+++ b/web-vue/packages/biz/views/biz/calendarSchedule/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:calendarSchedule:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizCalendarScheduleForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizCalendarSchedule, bizCalendarScheduleSave, bizCalendarScheduleForm } from '@jeesite/biz/api/biz/calendarSchedule';
 
   const emit = defineEmits(['success', 'register']);
@@ -159,8 +159,8 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizCalendarScheduleForm(data);
     record.value = (res.bizCalendarSchedule || {}) as BizCalendarSchedule;
@@ -169,13 +169,13 @@
       record.value.scheduleNo = RcTimestamp(); 
     }
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         scheduleId: record.value.scheduleId || data.scheduleId,
@@ -183,7 +183,7 @@
       // console.log('submit', params, data, record);
       const res = await bizCalendarScheduleSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -191,7 +191,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/calendarSchedule/list.vue b/web-vue/packages/biz/views/biz/calendarSchedule/list.vue
index ab6cbde5..c1ba68bb 100644
--- a/web-vue/packages/biz/views/biz/calendarSchedule/list.vue
+++ b/web-vue/packages/biz/views/biz/calendarSchedule/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizCalendarSchedule, bizCalendarScheduleList } from '@jeesite/biz/api/biz/calendarSchedule';
   import { bizCalendarScheduleDelete, bizCalendarScheduleListData } from '@jeesite/biz/api/biz/calendarSchedule';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -273,10 +272,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/cities/form.vue b/web-vue/packages/biz/views/biz/cities/form.vue
index e3d8ff34..d0f4bc35 100644
--- a/web-vue/packages/biz/views/biz/cities/form.vue
+++ b/web-vue/packages/biz/views/biz/cities/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:cities:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="40%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizCitiesForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizCities, bizCitiesSave, bizCitiesForm } from '@jeesite/biz/api/biz/cities';
 
   const emit = defineEmits(['success', 'register']);
@@ -113,20 +113,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizCitiesForm(data);
     record.value = (res.bizCities || {}) as BizCities;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -134,7 +134,7 @@
       // console.log('submit', params, data, record);
       const res = await bizCitiesSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -142,7 +142,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/cities/list.vue b/web-vue/packages/biz/views/biz/cities/list.vue
index bec2510d..319f2151 100644
--- a/web-vue/packages/biz/views/biz/cities/list.vue
+++ b/web-vue/packages/biz/views/biz/cities/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizCities, bizCitiesList } from '@jeesite/biz/api/biz/cities';
   import { bizCitiesDelete, bizCitiesListData } from '@jeesite/biz/api/biz/cities';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -240,10 +239,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/cities/select.ts b/web-vue/packages/biz/views/biz/cities/select.ts
deleted file mode 100644
index 1b7708ac..00000000
--- a/web-vue/packages/biz/views/biz/cities/select.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { BizCities, bizCitiesListData } from '@jeesite/biz/api/biz/cities';
-
-const { t } = useI18n('biz.cities');
-
-const modalProps = {
-  title: t('市区信息选择'),
-};
-
-const searchForm: FormProps<BizCities> = {
-  baseColProps: { md: 8, lg: 6 },
-  labelWidth: 90,
-  schemas: [
-    {
-      label: t('记录时间起'),
-      field: 'createTime_gte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('记录时间止'),
-      field: 'createTime_lte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('省份编码'),
-      field: 'provinceCode',
-      component: 'Input',
-    },
-    {
-      label: t('市区编码'),
-      field: 'cityCode',
-      component: 'Input',
-    },
-    {
-      label: t('市区名称'),
-      field: 'cityName',
-      component: 'Input',
-    },
-    {
-      label: t('市区级别'),
-      field: 'areaType',
-      component: 'Select',
-      componentProps: {
-        dictType: '',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('数据状态'),
-      field: 'dataStatus',
-      component: 'Select',
-      componentProps: {
-        dictType: '',
-        allowClear: true,
-      },
-    },
-  ],
-};
-
-const tableColumns: BasicColumn<BizCities>[] = [
-  {
-    title: t('记录时间'),
-    dataIndex: 'createTime',
-    key: 'a.create_time',
-    sorter: true,
-    width: 230,
-    align: 'left',
-    slot: 'firstColumn',
-  },
-  {
-    title: t('省份编码'),
-    dataIndex: 'provinceCode',
-    key: 'a.province_code',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('市区编码'),
-    dataIndex: 'cityCode',
-    key: 'a.city_code',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('市区名称'),
-    dataIndex: 'cityName',
-    key: 'a.city_name',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('市区区号'),
-    dataIndex: 'areaCode',
-    key: 'a.area_code',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('市区级别'),
-    dataIndex: 'areaType',
-    key: 'a.area_type',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: '',
-  },
-  {
-    title: t('更新时间'),
-    dataIndex: 'updateTime',
-    key: 'a.update_time',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
-  {
-    title: t('数据状态'),
-    dataIndex: 'dataStatus',
-    key: 'a.data_status',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: '',
-  },
-];
-
-const tableProps: BasicTableProps = {
-  api: bizCitiesListData,
-  beforeFetch: (params) => {
-    params['isAll'] = true;
-    return params;
-  },
-  columns: tableColumns,
-  formConfig: searchForm,
-  rowKey: 'id',
-};
-
-export default {
-  modalProps,
-  tableProps,
-  itemCode: 'id',
-  itemName: 'id',
-  isShowCode: false,
-};
diff --git a/web-vue/packages/biz/views/biz/company/form.vue b/web-vue/packages/biz/views/biz/company/form.vue
index 62537477..a25c2d24 100644
--- a/web-vue/packages/biz/views/biz/company/form.vue
+++ b/web-vue/packages/biz/views/biz/company/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:company:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizCompanyForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizCompany, bizCompanySave, bizCompanyForm } from '@jeesite/biz/api/biz/company';
 
   const emit = defineEmits(['success', 'register']);
@@ -118,20 +118,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizCompanyForm(data);
     record.value = (res.bizCompany || {}) as BizCompany;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         companyId: record.value.companyId || data.companyId,
@@ -139,7 +139,7 @@
       // console.log('submit', params, data, record);
       const res = await bizCompanySave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -147,7 +147,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/company/list.vue b/web-vue/packages/biz/views/biz/company/list.vue
index b02103ec..ef42308d 100644
--- a/web-vue/packages/biz/views/biz/company/list.vue
+++ b/web-vue/packages/biz/views/biz/company/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizCompany, bizCompanyList } from '@jeesite/biz/api/biz/company';
   import { bizCompanyDelete, bizCompanyListData } from '@jeesite/biz/api/biz/company';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -231,10 +230,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/dataInfo/index.vue b/web-vue/packages/biz/views/biz/dataInfo/index.vue
new file mode 100644
index 00000000..3807f7e7
--- /dev/null
+++ b/web-vue/packages/biz/views/biz/dataInfo/index.vue
@@ -0,0 +1,30 @@
+<template>
+	<div class="web-page-container">
+		<Tabs v-model:activeKey="activeKey">
+			<TabPane key="1" tab="数据信息">
+				<TableInfo />
+			</TabPane>
+			<TabPane key="2" tab="字段信息">
+				<TableField />
+			</TabPane>
+		</Tabs>
+	</div>
+</template>
+<script lang="ts" setup name="AboutPage">
+  import { h, ref } from 'vue';
+  import { Tag, Tabs ,TabPane } from 'ant-design-vue';
+  import TableInfo from './tableInfo/list.vue';
+  import TableField from './tableField/list.vue';
+  const activeKey = ref('1');
+</script>
+
+<style scoped lang="less">
+// 整体容器样式
+.web-page-container {
+  width: 100%;
+  background-color: #e8f4f8;
+  display: flex;
+  flex-direction: column; // 垂直布局
+  overflow: hidden; // 防止内容溢出
+}
+</style>
\ No newline at end of file
diff --git a/web-vue/packages/biz/views/biz/tableField/formImport.vue b/web-vue/packages/biz/views/biz/dataInfo/tableField/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/tableField/formImport.vue
rename to web-vue/packages/biz/views/biz/dataInfo/tableField/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/tableField/list.vue b/web-vue/packages/biz/views/biz/dataInfo/tableField/list.vue
similarity index 99%
rename from web-vue/packages/biz/views/biz/tableField/list.vue
rename to web-vue/packages/biz/views/biz/dataInfo/tableField/list.vue
index 057b364f..ebfb1e67 100644
--- a/web-vue/packages/biz/views/biz/tableField/list.vue
+++ b/web-vue/packages/biz/views/biz/dataInfo/tableField/list.vue
@@ -42,7 +42,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('字段信息管理'),
+    value: '字段信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/biz/views/biz/tableInfo/formImport.vue b/web-vue/packages/biz/views/biz/dataInfo/tableInfo/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/tableInfo/formImport.vue
rename to web-vue/packages/biz/views/biz/dataInfo/tableInfo/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/tableInfo/list.vue b/web-vue/packages/biz/views/biz/dataInfo/tableInfo/list.vue
similarity index 99%
rename from web-vue/packages/biz/views/biz/tableInfo/list.vue
rename to web-vue/packages/biz/views/biz/dataInfo/tableInfo/list.vue
index eea84243..6474a7ef 100644
--- a/web-vue/packages/biz/views/biz/tableInfo/list.vue
+++ b/web-vue/packages/biz/views/biz/dataInfo/tableInfo/list.vue
@@ -42,7 +42,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('数据信息管理'),
+    value: '数据信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/biz/views/biz/dataReport/form.vue b/web-vue/packages/biz/views/biz/dataReport/form.vue
index 03b2fdfd..f92a158d 100644
--- a/web-vue/packages/biz/views/biz/dataReport/form.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:dataReport:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizDataReportForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizDataReport, bizDataReportSave, bizDataReportForm } from '@jeesite/biz/api/biz/dataReport';
 
   const emit = defineEmits(['success', 'register']);
@@ -95,20 +95,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizDataReportForm(data);
     record.value = (res.bizDataReport || {}) as BizDataReport;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -116,7 +116,7 @@
       // console.log('submit', params, data, record);
       const res = await bizDataReportSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -124,7 +124,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/dataReport/index.vue b/web-vue/packages/biz/views/biz/dataReport/index.vue
new file mode 100644
index 00000000..36036592
--- /dev/null
+++ b/web-vue/packages/biz/views/biz/dataReport/index.vue
@@ -0,0 +1,30 @@
+<template>
+	<div class="web-page-container">
+		<Tabs v-model:activeKey="activeKey">
+			<TabPane key="1" tab="指标信息">
+				<DataReport />
+			</TabPane>
+			<TabPane key="2" tab="财务管控">
+				<ErpReport />
+			</TabPane>
+		</Tabs>
+	</div>
+</template>
+<script lang="ts" setup name="AboutPage">
+  import { h, ref } from 'vue';
+  import { Tag, Tabs ,TabPane } from 'ant-design-vue';
+  import DataReport from './list.vue';
+  import ErpReport from './erp/index.vue';
+  const activeKey = ref('1');
+</script>
+
+<style scoped lang="less">
+// 整体容器样式
+.web-page-container {
+  width: 100%;
+  background-color: #e8f4f8;
+  display: flex;
+  flex-direction: column; // 垂直布局
+  overflow: hidden; // 防止内容溢出
+}
+</style>
\ No newline at end of file
diff --git a/web-vue/packages/biz/views/biz/dataReport/list.vue b/web-vue/packages/biz/views/biz/dataReport/list.vue
index 003e229f..b8517c01 100644
--- a/web-vue/packages/biz/views/biz/dataReport/list.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/list.vue
@@ -27,7 +27,7 @@
 		  <img :src="record.image" style="width: 30px; height: 24px; object-fit: contain;" />
 	  </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -42,7 +42,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizDataReport, bizDataReportList } from '@jeesite/biz/api/biz/dataReport';
   import { bizDataReportDelete, bizDataReportListData } from '@jeesite/biz/api/biz/dataReport';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -185,10 +184,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/dbConfig/form.vue b/web-vue/packages/biz/views/biz/dbConfig/form.vue
index 147b5ec1..835a19d4 100644
--- a/web-vue/packages/biz/views/biz/dbConfig/form.vue
+++ b/web-vue/packages/biz/views/biz/dbConfig/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:dbConfig:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizDbConfigForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizDbConfig, bizDbConfigSave, bizDbConfigForm } from '@jeesite/biz/api/biz/dbConfig';
 
   const emit = defineEmits(['success', 'register']);
@@ -129,20 +129,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizDbConfigForm(data);
     record.value = (res.bizDbConfig || {}) as BizDbConfig;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -150,7 +150,7 @@
       // console.log('submit', params, data, record);
       const res = await bizDbConfigSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -158,7 +158,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/dbConfig/list.vue b/web-vue/packages/biz/views/biz/dbConfig/list.vue
index 83f0e7b7..668bdb72 100644
--- a/web-vue/packages/biz/views/biz/dbConfig/list.vue
+++ b/web-vue/packages/biz/views/biz/dbConfig/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizDbConfig, bizDbConfigList } from '@jeesite/biz/api/biz/dbConfig';
   import { bizDbConfigDelete, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -251,10 +250,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/dbConfig/select.ts b/web-vue/packages/biz/views/biz/dbConfig/select.ts
deleted file mode 100644
index 80ee622e..00000000
--- a/web-vue/packages/biz/views/biz/dbConfig/select.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { BizDbConfig, bizDbConfigListData } from '@jeesite/biz/api/biz/dbConfig';
-
-const { t } = useI18n('biz.dbConfig');
-
-const modalProps = {
-  title: t('连接信息选择'),
-};
-
-const searchForm: FormProps<BizDbConfig> = {
-  baseColProps: { md: 8, lg: 6 },
-  labelWidth: 90,
-  schemas: [
-    {
-      label: t('创建时间起'),
-      field: 'createTime_gte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('创建时间止'),
-      field: 'createTime_lte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('数据库类型'),
-      field: 'dbType',
-      component: 'Select',
-      componentProps: {
-        dictType: 'db_type',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('数据库名称'),
-      field: 'dbName',
-      component: 'Input',
-    },
-    {
-      label: t('数据库IP'),
-      field: 'dbIp',
-      component: 'Input',
-    },
-    {
-      label: t('数据库描述'),
-      field: 'description',
-      component: 'Input',
-    },
-    {
-      label: t('是否启用'),
-      field: 'isEnabled',
-      component: 'Select',
-      componentProps: {
-        dictType: 'is_active',
-        allowClear: true,
-      },
-    },
-  ],
-};
-
-const tableColumns: BasicColumn<BizDbConfig>[] = [
-  {
-    title: t('创建时间'),
-    dataIndex: 'createTime',
-    key: 'a.create_time',
-    sorter: true,
-    width: 180,
-    align: 'left',
-	fixed: 'left'
-  },
-  {
-    title: t('数据库类型'),
-    dataIndex: 'dbType',
-    key: 'a.db_type',
-    sorter: true,
-    width: 130,
-    align: 'left',
-	dictType: 'db_type',
-  },
-  {
-    title: t('数据库名称'),
-    dataIndex: 'dbName',
-    key: 'a.db_name',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('数据库IP'),
-    dataIndex: 'dbIp',
-    key: 'a.db_ip',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('数据库端口'),
-    dataIndex: 'dbPort',
-    key: 'a.db_port',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
-  {
-    title: t('数据库账号'),
-    dataIndex: 'dbUsername',
-    key: 'a.db_username',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('数据库描述'),
-    dataIndex: 'description',
-    key: 'a.description',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('是否启用'),
-    dataIndex: 'isEnabled',
-    key: 'a.is_enabled',
-    sorter: true,
-    width: 130,
-    align: 'center',
-	dictType: 'is_active',
-  },
-  {
-    title: t('schema名称'),
-    dataIndex: 'dbSchemaName',
-    key: 'a.db_schema_name',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('更新时间'),
-    dataIndex: 'updateTime',
-    key: 'a.update_time',
-    sorter: true,
-    width: 180,
-    align: 'center',
-  },
-];
-
-const tableProps: BasicTableProps = {
-  api: bizDbConfigListData,
-  beforeFetch: (params) => {
-    params['isAll'] = true;
-    return params;
-  },
-  columns: tableColumns,
-  formConfig: searchForm,
-  rowKey: 'id',
-};
-
-export default {
-  modalProps,
-  tableProps,
-  itemCode: 'id',
-  itemName: 'dbName',
-  isShowCode: true,
-};
diff --git a/web-vue/packages/biz/views/biz/hostInfo/index.vue b/web-vue/packages/biz/views/biz/hostInfo/index.vue
new file mode 100644
index 00000000..cfe0052b
--- /dev/null
+++ b/web-vue/packages/biz/views/biz/hostInfo/index.vue
@@ -0,0 +1,30 @@
+<template>
+	<div class="web-page-container">
+		<Tabs v-model:activeKey="activeKey">
+			<TabPane key="1" tab="主机信息">
+				<MonitorHost />
+			</TabPane>
+			<TabPane key="2" tab="账号信息">
+				<MonitorAccount />
+			</TabPane>
+		</Tabs>
+	</div>
+</template>
+<script lang="ts" setup name="AboutPage">
+  import { h, ref } from 'vue';
+  import { Tag, Tabs ,TabPane } from 'ant-design-vue';
+  import MonitorHost from './monitorHost/list.vue';
+  import MonitorAccount from './monitorAccount/list.vue';
+  const activeKey = ref('1');
+</script>
+
+<style scoped lang="less">
+// 整体容器样式
+.web-page-container {
+  width: 100%;
+  background-color: #e8f4f8;
+  display: flex;
+  flex-direction: column; // 垂直布局
+  overflow: hidden; // 防止内容溢出
+}
+</style>
\ No newline at end of file
diff --git a/web-vue/packages/biz/views/biz/monitorAccount/form.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
similarity index 89%
rename from web-vue/packages/biz/views/biz/monitorAccount/form.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
index 9667ba32..22c7ec45 100644
--- a/web-vue/packages/biz/views/biz/monitorAccount/form.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:monitorAccount:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizMonitorAccountForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizMonitorAccount, bizMonitorAccountSave, bizMonitorAccountForm } from '@jeesite/biz/api/biz/monitorAccount';
 
   const emit = defineEmits(['success', 'register']);
@@ -122,20 +122,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizMonitorAccountForm(data);
     record.value = (res.bizMonitorAccount || {}) as BizMonitorAccount;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         accountId: record.value.accountId || data.accountId,
@@ -143,7 +143,7 @@
       // console.log('submit', params, data, record);
       const res = await bizMonitorAccountSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -151,7 +151,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/monitorAccount/formImport.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/monitorAccount/formImport.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorAccount/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/monitorAccount/list.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/list.vue
similarity index 96%
rename from web-vue/packages/biz/views/biz/monitorAccount/list.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorAccount/list.vue
index c74a6f75..6f036643 100644
--- a/web-vue/packages/biz/views/biz/monitorAccount/list.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorAccount/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizMonitorAccount, bizMonitorAccountList } from '@jeesite/biz/api/biz/monitorAccount';
   import { bizMonitorAccountDelete, bizMonitorAccountListData } from '@jeesite/biz/api/biz/monitorAccount';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -52,7 +51,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('账号信息管理'),
+    value: '账号信息管理',
   };
   const loading = ref(false);
 
@@ -243,10 +242,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/monitorHost/form.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
similarity index 90%
rename from web-vue/packages/biz/views/biz/monitorHost/form.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
index 7970bdeb..d86602d7 100644
--- a/web-vue/packages/biz/views/biz/monitorHost/form.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:monitorHost:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizMonitorHostForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizMonitorHost, bizMonitorHostSave, bizMonitorHostForm } from '@jeesite/biz/api/biz/monitorHost';
 
   const emit = defineEmits(['success', 'register']);
@@ -152,20 +152,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizMonitorHostForm(data);
     record.value = (res.bizMonitorHost || {}) as BizMonitorHost;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         hostId: record.value.hostId || data.hostId,
@@ -173,7 +173,7 @@
       // console.log('submit', params, data, record);
       const res = await bizMonitorHostSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -181,7 +181,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/monitorHost/formImport.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/monitorHost/formImport.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorHost/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/monitorHost/list.vue b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/list.vue
similarity index 97%
rename from web-vue/packages/biz/views/biz/monitorHost/list.vue
rename to web-vue/packages/biz/views/biz/hostInfo/monitorHost/list.vue
index 8eecf34b..0bb0a89a 100644
--- a/web-vue/packages/biz/views/biz/monitorHost/list.vue
+++ b/web-vue/packages/biz/views/biz/hostInfo/monitorHost/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizMonitorHost, bizMonitorHostList } from '@jeesite/biz/api/biz/monitorHost';
   import { bizMonitorHostDelete, bizMonitorHostListData } from '@jeesite/biz/api/biz/monitorHost';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -52,7 +51,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('主机信息管理'),
+    value: '主机信息管理',
   };
   const loading = ref(false);
 
@@ -310,10 +309,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/listItem/form.vue b/web-vue/packages/biz/views/biz/listItem/form.vue
index 902d3583..6bd2376b 100644
--- a/web-vue/packages/biz/views/biz/listItem/form.vue
+++ b/web-vue/packages/biz/views/biz/listItem/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:listItem:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizListItemForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizListItem, bizListItemSave, bizListItemForm } from '@jeesite/biz/api/biz/listItem';
 
   const emit = defineEmits(['success', 'register']);
@@ -95,20 +95,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizListItemForm(data);
     record.value = (res.bizListItem || {}) as BizListItem;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -116,7 +116,7 @@
       // console.log('submit', params, data, record);
       const res = await bizListItemSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -124,7 +124,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/listItem/list.vue b/web-vue/packages/biz/views/biz/listItem/list.vue
index 08bb07f1..5d7377e8 100644
--- a/web-vue/packages/biz/views/biz/listItem/list.vue
+++ b/web-vue/packages/biz/views/biz/listItem/list.vue
@@ -27,7 +27,7 @@
 	    <img :src="record.avatar" style="width: 20px; height: 20px; object-fit: cover; border-radius: 50%; display: inline-block; vertical-align: middle;" />
 	  </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -42,7 +42,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizListItem, bizListItemList } from '@jeesite/biz/api/biz/listItem';
   import { bizListItemDelete, bizListItemListData } from '@jeesite/biz/api/biz/listItem';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -278,10 +277,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/monitorAccount/select.ts b/web-vue/packages/biz/views/biz/monitorAccount/select.ts
deleted file mode 100644
index 4884d4c6..00000000
--- a/web-vue/packages/biz/views/biz/monitorAccount/select.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { bizMonitorAccountListData } from '@jeesite/biz/api/biz/monitorAccount';
-
-const { t } = useI18n('biz.monitorAccount');
-
-const modalProps = {
-  title: t('账号信息选择'),
-};
-
-const searchForm: FormProps<BizMonitorAccount> = {
-  baseColProps: { md: 8, lg: 6 },
-  labelWidth: 90,
-  schemas: [
-    {
-      label: t('记录时间起'),
-      field: 'createTime_gte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('记录时间止'),
-      field: 'createTime_lte',
-      component: 'DatePicker',
-      componentProps: {
-        format: 'YYYY-MM-DD HH:mm',
-        showTime: { format: 'HH:mm' },
-      },
-    },
-    {
-      label: t('主机标识'),
-      field: 'hostId',
-      component: 'Input',
-    },
-    {
-      label: t('登录账号'),
-      field: 'sshUsername',
-      component: 'Input',
-    },
-    {
-      label: t('初始目录'),
-      field: 'initialPath',
-      component: 'Input',
-    },
-    {
-      label: t('账号状态'),
-      field: 'ustatus',
-      component: 'Input',
-    },
-    {
-      label: t('备注信息'),
-      field: 'remark',
-      component: 'Input',
-    },
-  ],
-};
-
-const tableColumns: BasicColumn<BizMonitorAccount>[] = [
-  {
-    title: t('记录时间'),
-    dataIndex: 'createTime',
-    key: 'a.create_time',
-    sorter: true,
-    width: 230,
-    align: 'left',
-    slot: 'firstColumn',
-  },
-  {
-    title: t('主机标识'),
-    dataIndex: 'hostId',
-    key: 'a.host_id',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('登录账号'),
-    dataIndex: 'sshUsername',
-    key: 'a.ssh_username',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('登录密码'),
-    dataIndex: 'sshPassword',
-    key: 'a.ssh_password',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('登录端口'),
-    dataIndex: 'sshPort',
-    key: 'a.ssh_port',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
-  {
-    title: t('初始目录'),
-    dataIndex: 'initialPath',
-    key: 'a.initial_path',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('超时时间'),
-    dataIndex: 'timeoutSeconds',
-    key: 'a.timeout_seconds',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
-  {
-    title: t('账号状态'),
-    dataIndex: 'ustatus',
-    key: 'a.ustatus',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('备注信息'),
-    dataIndex: 'remark',
-    key: 'a.remark',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('更新时间'),
-    dataIndex: 'updateTime',
-    key: 'a.update_time',
-    sorter: true,
-    width: 130,
-    align: 'center',
-  },
-];
-
-const tableProps: BasicTableProps = {
-  api: bizMonitorAccountListData,
-  beforeFetch: (params) => {
-    params['isAll'] = true;
-    return params;
-  },
-  columns: tableColumns,
-  formConfig: searchForm,
-  rowKey: 'accountId',
-};
-
-export default {
-  modalProps,
-  tableProps,
-  itemCode: 'accountId',
-  itemName: 'accountId',
-  isShowCode: false,
-};
diff --git a/web-vue/packages/biz/views/biz/monitorHost/select.ts b/web-vue/packages/biz/views/biz/monitorHost/select.ts
deleted file mode 100644
index 69e3c6ff..00000000
--- a/web-vue/packages/biz/views/biz/monitorHost/select.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { useI18n } from '@jeesite/core/hooks/web/useI18n';
-import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { BizMonitorHost, bizMonitorHostListData } from '@jeesite/biz/api/biz/monitorHost';
-
-const { t } = useI18n('biz.monitorHost');
-
-const modalProps = {
-  title: t('主机信息选择'),
-};
-
-const searchForm: FormProps<BizMonitorHost> = {
-  baseColProps: { md: 8, lg: 6 },
-  labelWidth: 90,
-  schemas: [
-    {
-      label: t('主机名称'),
-      field: 'hostname',
-      component: 'Input',
-    },
-    {
-      label: t('IP地址'),
-      field: 'ipAddress',
-      component: 'Input',
-    },
-    {
-      label: t('主机类型'),
-      field: 'hostType',
-      component: 'Select',
-      componentProps: {
-        dictType: 'host_type',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('操作系统'),
-      field: 'hostOs',
-      component: 'Select',
-      componentProps: {
-        dictType: 'host_os',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('主机状态'),
-      field: 'ustatus',
-      component: 'Select',
-      componentProps: {
-        dictType: 'host_status',
-        allowClear: true,
-      },
-    },
-    {
-      label: t('物理位置'),
-      field: 'locationName',
-      component: 'Input',
-    },
-    {
-      label: t('地址类型'),
-      field: 'locationType',
-      component: 'Select',
-      componentProps: {
-        dictType: 'location_type',
-        allowClear: true,
-      },
-    },
-  ],
-};
-
-const tableColumns: BasicColumn<BizMonitorHost>[] = [
-  {
-    title: t('记录时间'),
-    dataIndex: 'createTime',
-    key: 'a.create_time',
-    sorter: true,
-    width: 180,
-    align: 'left',
-  },
-  {
-    title: t('主机名称'),
-    dataIndex: 'hostname',
-    key: 'a.hostname',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('IP地址'),
-    dataIndex: 'ipAddress',
-    key: 'a.ip_address',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('主机类型'),
-    dataIndex: 'hostType',
-    key: 'a.host_type',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: 'host_type',
-  },
-  {
-    title: t('操作系统'),
-    dataIndex: 'hostOs',
-    key: 'a.host_os',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: 'host_os',
-  },
-  {
-    title: t('主机状态'),
-    dataIndex: 'ustatus',
-    key: 'a.ustatus',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: 'host_status',
-  },
-  {
-    title: t('监测运行时间'),
-    dataIndex: 'lastOnlineTime',
-    key: 'a.last_online_time',
-    sorter: true,
-    width: 180,
-    align: 'center',
-  },
-  {
-    title: t('物理位置'),
-    dataIndex: 'locationName',
-    key: 'a.location_name',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('地址类型'),
-    dataIndex: 'locationType',
-    key: 'a.location_type',
-    sorter: true,
-    width: 130,
-    align: 'left',
-    dictType: 'location_type',
-  },
-  {
-    title: t('联系方式'),
-    dataIndex: 'otherContact',
-    key: 'a.other_contact',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('备注信息'),
-    dataIndex: 'remark',
-    key: 'a.remark',
-    sorter: true,
-    width: 130,
-    align: 'left',
-  },
-  {
-    title: t('更新时间'),
-    dataIndex: 'updateTime',
-    key: 'a.update_time',
-    sorter: true,
-    width: 180,
-    align: 'center',
-  },
-  {
-    title: t('失效日期'),
-    dataIndex: 'expiryDate',
-    key: 'a.expiry_date',
-    sorter: true,
-    width: 180,
-    align: 'center',
-  },
-];
-
-const tableProps: BasicTableProps = {
-  api: bizMonitorHostListData,
-  beforeFetch: (params) => {
-    params['isAll'] = true;
-    return params;
-  },
-  columns: tableColumns,
-  formConfig: searchForm,
-  rowKey: 'hostId',
-};
-
-export default {
-  modalProps,
-  tableProps,
-  itemCode: 'hostId',
-  itemName: 'hostId',
-  isShowCode: false,
-};
diff --git a/web-vue/packages/biz/views/biz/deviceInfo/formImport.vue b/web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/deviceInfo/formImport.vue
rename to web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/deviceInfo/list.vue b/web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/list.vue
similarity index 99%
rename from web-vue/packages/biz/views/biz/deviceInfo/list.vue
rename to web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/list.vue
index 8f754d4c..bd93c942 100644
--- a/web-vue/packages/biz/views/biz/deviceInfo/list.vue
+++ b/web-vue/packages/biz/views/biz/monitorInfo/deviceInfo/list.vue
@@ -42,7 +42,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('磁盘信息管理'),
+    value: '磁盘信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/biz/views/biz/monitorInfo/index.vue b/web-vue/packages/biz/views/biz/monitorInfo/index.vue
new file mode 100644
index 00000000..0f2f1d9f
--- /dev/null
+++ b/web-vue/packages/biz/views/biz/monitorInfo/index.vue
@@ -0,0 +1,30 @@
+<template>
+	<div class="web-page-container">
+		<Tabs v-model:activeKey="activeKey">
+			<TabPane key="1" tab="运行信息">
+				<ServerInfo />
+			</TabPane>
+			<TabPane key="2" tab="磁盘信息">
+				<DeviceInfo />
+			</TabPane>
+		</Tabs>
+	</div>
+</template>
+<script lang="ts" setup name="AboutPage">
+  import { h, ref } from 'vue';
+  import { Tag, Tabs ,TabPane } from 'ant-design-vue';
+  import ServerInfo from './serverInfo/list.vue';
+  import DeviceInfo from './deviceInfo/list.vue';
+  const activeKey = ref('1');
+</script>
+
+<style scoped lang="less">
+// 整体容器样式
+.web-page-container {
+  width: 100%;
+  background-color: #e8f4f8;
+  display: flex;
+  flex-direction: column; // 垂直布局
+  overflow: hidden; // 防止内容溢出
+}
+</style>
\ No newline at end of file
diff --git a/web-vue/packages/biz/views/biz/serverInfo/formImport.vue b/web-vue/packages/biz/views/biz/monitorInfo/serverInfo/formImport.vue
similarity index 100%
rename from web-vue/packages/biz/views/biz/serverInfo/formImport.vue
rename to web-vue/packages/biz/views/biz/monitorInfo/serverInfo/formImport.vue
diff --git a/web-vue/packages/biz/views/biz/serverInfo/list.vue b/web-vue/packages/biz/views/biz/monitorInfo/serverInfo/list.vue
similarity index 99%
rename from web-vue/packages/biz/views/biz/serverInfo/list.vue
rename to web-vue/packages/biz/views/biz/monitorInfo/serverInfo/list.vue
index 88e0ea2e..bc55ca87 100644
--- a/web-vue/packages/biz/views/biz/serverInfo/list.vue
+++ b/web-vue/packages/biz/views/biz/monitorInfo/serverInfo/list.vue
@@ -42,7 +42,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('运行信息管理'),
+    value: '运行信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/biz/views/biz/municipalities/form.vue b/web-vue/packages/biz/views/biz/municipalities/form.vue
index b77fcfcb..4cdef882 100644
--- a/web-vue/packages/biz/views/biz/municipalities/form.vue
+++ b/web-vue/packages/biz/views/biz/municipalities/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:municipalities:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizMunicipalitiesForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
   import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
   import { BizMunicipalities, bizMunicipalitiesSave, bizMunicipalitiesForm } from '@jeesite/biz/api/biz/municipalities';
@@ -147,20 +147,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizMunicipalitiesForm(data);
     record.value = (res.bizMunicipalities || {}) as BizMunicipalities;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -168,7 +168,7 @@
       // console.log('submit', params, data, record);
       const res = await bizMunicipalitiesSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -176,7 +176,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/municipalities/list.vue b/web-vue/packages/biz/views/biz/municipalities/list.vue
index 67d76726..78ec4a08 100644
--- a/web-vue/packages/biz/views/biz/municipalities/list.vue
+++ b/web-vue/packages/biz/views/biz/municipalities/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -41,7 +41,6 @@
   import { bizMunicipalitiesDelete, bizMunicipalitiesListData } from '@jeesite/biz/api/biz/municipalities';
   import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
   import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -303,10 +302,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/projectInfo/form.vue b/web-vue/packages/biz/views/biz/projectInfo/form.vue
index 331065a9..237ac201 100644
--- a/web-vue/packages/biz/views/biz/projectInfo/form.vue
+++ b/web-vue/packages/biz/views/biz/projectInfo/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:projectInfo:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizProjectInfoForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizProjectInfo, bizProjectInfoSave, bizProjectInfoForm } from '@jeesite/biz/api/biz/projectInfo';
 
   const emit = defineEmits(['success', 'register']);
@@ -133,20 +133,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizProjectInfoForm(data);
     record.value = (res.bizProjectInfo || {}) as BizProjectInfo;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         projectId: record.value.projectId || data.projectId,
@@ -154,7 +154,7 @@
       // console.log('submit', params, data, record);
       const res = await bizProjectInfoSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -162,7 +162,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/projectInfo/list.vue b/web-vue/packages/biz/views/biz/projectInfo/list.vue
index 0b30f8b1..fb4a2c83 100644
--- a/web-vue/packages/biz/views/biz/projectInfo/list.vue
+++ b/web-vue/packages/biz/views/biz/projectInfo/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizProjectInfo, bizProjectInfoList } from '@jeesite/biz/api/biz/projectInfo';
   import { bizProjectInfoDelete, bizProjectInfoListData } from '@jeesite/biz/api/biz/projectInfo';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -240,10 +239,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/projectReport/form.vue b/web-vue/packages/biz/views/biz/projectReport/form.vue
index 7c404b27..c3c1b4a9 100644
--- a/web-vue/packages/biz/views/biz/projectReport/form.vue
+++ b/web-vue/packages/biz/views/biz/projectReport/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:projectReport:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizProjectReportForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizProjectReport, bizProjectReportSave, bizProjectReportForm } from '@jeesite/biz/api/biz/projectReport';
 
   const emit = defineEmits(['success', 'register']);
@@ -155,20 +155,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizProjectReportForm(data);
     record.value = (res.bizProjectReport || {}) as BizProjectReport;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         reportId: record.value.reportId || data.reportId,
@@ -176,7 +176,7 @@
       // console.log('submit', params, data, record);
       const res = await bizProjectReportSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -184,7 +184,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/projectReport/list.vue b/web-vue/packages/biz/views/biz/projectReport/list.vue
index 8cb32171..57b269bd 100644
--- a/web-vue/packages/biz/views/biz/projectReport/list.vue
+++ b/web-vue/packages/biz/views/biz/projectReport/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizProjectReport, bizProjectReportList } from '@jeesite/biz/api/biz/projectReport';
   import { bizProjectReportDelete, bizProjectReportListData } from '@jeesite/biz/api/biz/projectReport';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -252,10 +251,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/projectRequirements/form.vue b/web-vue/packages/biz/views/biz/projectRequirements/form.vue
index 93a2ebdd..8148156a 100644
--- a/web-vue/packages/biz/views/biz/projectRequirements/form.vue
+++ b/web-vue/packages/biz/views/biz/projectRequirements/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:projectRequirements:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizProjectRequirementsForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizProjectRequirements, bizProjectRequirementsSave, bizProjectRequirementsForm } from '@jeesite/biz/api/biz/projectRequirements';
 
   const emit = defineEmits(['success', 'register']);
@@ -151,20 +151,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizProjectRequirementsForm(data);
     record.value = (res.bizProjectRequirements || {}) as BizProjectRequirements;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         requirementId: record.value.requirementId || data.requirementId,
@@ -172,7 +172,7 @@
       // console.log('submit', params, data, record);
       const res = await bizProjectRequirementsSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -180,7 +180,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/projectRequirements/list.vue b/web-vue/packages/biz/views/biz/projectRequirements/list.vue
index 31778046..bc4fdc9f 100644
--- a/web-vue/packages/biz/views/biz/projectRequirements/list.vue
+++ b/web-vue/packages/biz/views/biz/projectRequirements/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizProjectRequirements, bizProjectRequirementsList } from '@jeesite/biz/api/biz/projectRequirements';
   import { bizProjectRequirementsDelete, bizProjectRequirementsListData } from '@jeesite/biz/api/biz/projectRequirements';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -316,10 +315,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/province/form.vue b/web-vue/packages/biz/views/biz/province/form.vue
index b9e8aca7..6a8eafce 100644
--- a/web-vue/packages/biz/views/biz/province/form.vue
+++ b/web-vue/packages/biz/views/biz/province/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:province:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="40%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizProvinceForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizProvince, bizProvinceSave, bizProvinceForm } from '@jeesite/biz/api/biz/province';
 
   const emit = defineEmits(['success', 'register']);
@@ -110,20 +110,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizProvinceForm(data);
     record.value = (res.bizProvince || {}) as BizProvince;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -131,7 +131,7 @@
       // console.log('submit', params, data, record);
       const res = await bizProvinceSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -139,7 +139,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/province/list.vue b/web-vue/packages/biz/views/biz/province/list.vue
index f383603c..4ea53002 100644
--- a/web-vue/packages/biz/views/biz/province/list.vue
+++ b/web-vue/packages/biz/views/biz/province/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizProvince, bizProvinceList } from '@jeesite/biz/api/biz/province';
   import { bizProvinceDelete, bizProvinceListData } from '@jeesite/biz/api/biz/province';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -220,10 +219,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/quickLogin/form.vue b/web-vue/packages/biz/views/biz/quickLogin/form.vue
index e7bdeb96..4bddc70a 100644
--- a/web-vue/packages/biz/views/biz/quickLogin/form.vue
+++ b/web-vue/packages/biz/views/biz/quickLogin/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:quickLogin:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizQuickLoginForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizQuickLogin, bizQuickLoginSave, bizQuickLoginForm } from '@jeesite/biz/api/biz/quickLogin';
 
   const emit = defineEmits(['success', 'register']);
@@ -125,20 +125,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizQuickLoginForm(data);
     record.value = (res.bizQuickLogin || {}) as BizQuickLogin;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         id: record.value.id || data.id,
@@ -146,7 +146,7 @@
       // console.log('submit', params, data, record);
       const res = await bizQuickLoginSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -154,7 +154,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/quickLogin/list.vue b/web-vue/packages/biz/views/biz/quickLogin/list.vue
index 09260df4..482e33e0 100644
--- a/web-vue/packages/biz/views/biz/quickLogin/list.vue
+++ b/web-vue/packages/biz/views/biz/quickLogin/list.vue
@@ -24,7 +24,7 @@
 	    <img :src="record.iconClass" style="width: 30px; height: 24px; object-fit: contain;" />
 	  </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup name="ViewsBizQuickLoginList">
@@ -36,7 +36,7 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizQuickLogin, bizQuickLoginList } from '@jeesite/biz/api/biz/quickLogin';
   import { bizQuickLoginDelete, bizQuickLoginListData } from '@jeesite/biz/api/biz/quickLogin';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
+  import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
 
@@ -209,10 +209,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleDelete(record: Recordable) {
diff --git a/web-vue/packages/biz/views/biz/resumeEmployee/form.vue b/web-vue/packages/biz/views/biz/resumeEmployee/form.vue
index 0874b78e..c0aa33d4 100644
--- a/web-vue/packages/biz/views/biz/resumeEmployee/form.vue
+++ b/web-vue/packages/biz/views/biz/resumeEmployee/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:resumeEmployee:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizResumeEmployeeForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizResumeEmployee, bizResumeEmployeeSave, bizResumeEmployeeForm } from '@jeesite/biz/api/biz/resumeEmployee';
 
   const emit = defineEmits(['success', 'register']);
@@ -116,20 +116,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizResumeEmployeeForm(data);
     record.value = (res.bizResumeEmployee || {}) as BizResumeEmployee;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         employeeId: record.value.employeeId || data.employeeId,
@@ -137,7 +137,7 @@
       // console.log('submit', params, data, record);
       const res = await bizResumeEmployeeSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -145,7 +145,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/resumeEmployee/list.vue b/web-vue/packages/biz/views/biz/resumeEmployee/list.vue
index 79ef8660..eb3c569f 100644
--- a/web-vue/packages/biz/views/biz/resumeEmployee/list.vue
+++ b/web-vue/packages/biz/views/biz/resumeEmployee/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizResumeEmployee, bizResumeEmployeeList } from '@jeesite/biz/api/biz/resumeEmployee';
   import { bizResumeEmployeeDelete, bizResumeEmployeeListData } from '@jeesite/biz/api/biz/resumeEmployee';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -236,10 +235,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/biz/views/biz/websiteStorage/form.vue b/web-vue/packages/biz/views/biz/websiteStorage/form.vue
index 5e8583d9..f8ca790b 100644
--- a/web-vue/packages/biz/views/biz/websiteStorage/form.vue
+++ b/web-vue/packages/biz/views/biz/websiteStorage/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'biz:websiteStorage:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsBizWebsiteStorageForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { BizWebsiteStorage, bizWebsiteStorageSave, bizWebsiteStorageForm } from '@jeesite/biz/api/biz/websiteStorage';
 
   const emit = defineEmits(['success', 'register']);
@@ -121,20 +121,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await bizWebsiteStorageForm(data);
     record.value = (res.bizWebsiteStorage || {}) as BizWebsiteStorage;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         websiteId: record.value.websiteId || data.websiteId,
@@ -142,7 +142,7 @@
       // console.log('submit', params, data, record);
       const res = await bizWebsiteStorageSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -150,7 +150,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/biz/views/biz/websiteStorage/list.vue b/web-vue/packages/biz/views/biz/websiteStorage/list.vue
index dab5460a..bf446621 100644
--- a/web-vue/packages/biz/views/biz/websiteStorage/list.vue
+++ b/web-vue/packages/biz/views/biz/websiteStorage/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { BizWebsiteStorage, bizWebsiteStorageList } from '@jeesite/biz/api/biz/websiteStorage';
   import { bizWebsiteStorageDelete, bizWebsiteStorageListData } from '@jeesite/biz/api/biz/websiteStorage';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -249,10 +248,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/core/components/Modal/src/BasicModal.vue b/web-vue/packages/core/components/Modal/src/BasicModal.vue
index 212fb451..3bd1ff5d 100644
--- a/web-vue/packages/core/components/Modal/src/BasicModal.vue
+++ b/web-vue/packages/core/components/Modal/src/BasicModal.vue
@@ -245,6 +245,9 @@
 
 <style lang="less">
   @prefix-cls: ~'jeesite-basic-modal';
+  
+  @modal-footer-bg: #f0f7ff;
+  @modal-footer-border: #d6e8ff;
 
   .ant-modal.@{prefix-cls} {
     .ant-modal {
@@ -310,8 +313,11 @@
       &-footer {
         padding: 14px;
         margin-top: 0;
-        // border-top: 1px solid fade(@border-color-base, 50%);
-
+		background-color: @modal-footer-bg;
+		border-top: 1px solid @modal-footer-border;
+		padding: 12px 16px;
+		border-bottom-left-radius: 2px;
+		border-bottom-right-radius: 2px;
         button + button {
           margin-left: 10px;
         }
@@ -331,14 +337,6 @@
         }
       }
 
-      // 注释掉，防止点击全屏误触关闭
-      //&-close-x {
-      //  display: inline-block;
-      //  width: 96px;
-      //  height: 55px;
-      //  line-height: 55px;
-      //}
-
       &-confirm-body {
         .ant-modal-confirm-content {
           // color: #fff;
@@ -377,26 +375,6 @@
     }
   }
 
-  // .ant-modal.@{prefix-cls} {
-  //   top: 150px !important;
-  //   vertical-align: top !important;
-  // }
-  // @media screen and (max-height: 600px) {
-  //   .ant-modal.@{prefix-cls} {
-  //     top: 60px !important;
-  //   }
-  // }
-  // @media screen and (max-height: 540px) {
-  //   .ant-modal.@{prefix-cls} {
-  //     top: 30px !important;
-  //   }
-  // }
-  // @media screen and (max-height: 480px) {
-  //   .ant-modal.@{prefix-cls} {
-  //     top: 10px !important;
-  //   }
-  // }
-
   .fullscreen-modal {
     overflow: hidden;
 
diff --git a/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue b/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue
index 1ff6d5e1..0434d41c 100644
--- a/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue
+++ b/web-vue/packages/core/layouts/views/desktop/analysis/components/DynamicInfo.vue
@@ -105,7 +105,7 @@ export default defineComponent({
 
     // 跳转到更多页面
     const goToMorePage = () => {
-      router.push('/biz/serverInfo/list');
+      router.push('/biz/hostInfo/index');
     };
 
     // 根据使用率获取样式类
diff --git a/web-vue/packages/erp/views/erp/account/form.vue b/web-vue/packages/erp/views/erp/account/form.vue
index 369066fa..5d0ec50f 100644
--- a/web-vue/packages/erp/views/erp/account/form.vue
+++ b/web-vue/packages/erp/views/erp/account/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:account:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="40%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpAccountForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account';
 
   const emit = defineEmits(['success', 'register']);
@@ -108,20 +108,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpAccountForm(data);
     record.value = (res.erpAccount || {}) as ErpAccount;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         accountId: record.value.accountId || data.accountId,
@@ -129,7 +129,7 @@
       // console.log('submit', params, data, record);
       const res = await erpAccountSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -137,7 +137,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/erp/views/erp/account/list.vue b/web-vue/packages/erp/views/erp/account/list.vue
index ec383a85..5102479b 100644
--- a/web-vue/packages/erp/views/erp/account/list.vue
+++ b/web-vue/packages/erp/views/erp/account/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpAccount, erpAccountList } from '@jeesite/erp/api/erp/account';
   import { erpAccountDelete, erpAccountListData } from '@jeesite/erp/api/erp/account';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -200,10 +199,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/erp/views/erp/category/form.vue b/web-vue/packages/erp/views/erp/category/form.vue
index 16e796d9..5c7aa2ed 100644
--- a/web-vue/packages/erp/views/erp/category/form.vue
+++ b/web-vue/packages/erp/views/erp/category/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:category:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="40%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpCategoryForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { ErpCategory, erpCategorySave, erpCategoryForm } from '@jeesite/erp/api/erp/category';
 
   const emit = defineEmits(['success', 'register']);
@@ -107,20 +107,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpCategoryForm(data);
     record.value = (res.erpCategory || {}) as ErpCategory;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         categoryId: record.value.categoryId || data.categoryId,
@@ -128,7 +128,7 @@
       // console.log('submit', params, data, record);
       const res = await erpCategorySave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -136,7 +136,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/erp/views/erp/category/list.vue b/web-vue/packages/erp/views/erp/category/list.vue
index 95bf73e5..00f4f9e2 100644
--- a/web-vue/packages/erp/views/erp/category/list.vue
+++ b/web-vue/packages/erp/views/erp/category/list.vue
@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpCategory, erpCategoryList } from '@jeesite/erp/api/erp/category';
   import { erpCategoryDelete, erpCategoryListData } from '@jeesite/erp/api/erp/category';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -193,10 +192,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
diff --git a/web-vue/packages/erp/views/erp/expense/formImport.vue b/web-vue/packages/erp/views/erp/erpInc/expense/formImport.vue
similarity index 100%
rename from web-vue/packages/erp/views/erp/expense/formImport.vue
rename to web-vue/packages/erp/views/erp/erpInc/expense/formImport.vue
diff --git a/web-vue/packages/erp/views/erp/expense/list.vue b/web-vue/packages/erp/views/erp/erpInc/expense/list.vue
similarity index 99%
rename from web-vue/packages/erp/views/erp/expense/list.vue
rename to web-vue/packages/erp/views/erp/erpInc/expense/list.vue
index 495f4f6e..856f02df 100644
--- a/web-vue/packages/erp/views/erp/expense/list.vue
+++ b/web-vue/packages/erp/views/erp/erpInc/expense/list.vue
@@ -43,7 +43,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('支出信息管理'),
+    value: '支出信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/erp/views/erp/income/formImport.vue b/web-vue/packages/erp/views/erp/erpInc/income/formImport.vue
similarity index 100%
rename from web-vue/packages/erp/views/erp/income/formImport.vue
rename to web-vue/packages/erp/views/erp/erpInc/income/formImport.vue
diff --git a/web-vue/packages/erp/views/erp/income/list.vue b/web-vue/packages/erp/views/erp/erpInc/income/list.vue
similarity index 99%
rename from web-vue/packages/erp/views/erp/income/list.vue
rename to web-vue/packages/erp/views/erp/erpInc/income/list.vue
index d9975b03..3e7554ed 100644
--- a/web-vue/packages/erp/views/erp/income/list.vue
+++ b/web-vue/packages/erp/views/erp/erpInc/income/list.vue
@@ -43,7 +43,7 @@
 
   const getTitle = {
     icon: meta.icon || 'i-ant-design:book-outlined',
-    value: meta.title || t('收入信息管理'),
+    value: '收入信息管理',
   };
   const loading = ref(false);
 
diff --git a/web-vue/packages/erp/views/erp/erpInc/index.vue b/web-vue/packages/erp/views/erp/erpInc/index.vue
new file mode 100644
index 00000000..5c519e51
--- /dev/null
+++ b/web-vue/packages/erp/views/erp/erpInc/index.vue
@@ -0,0 +1,33 @@
+<template>
+	<div class="web-page-container">
+		<Tabs v-model:activeKey="activeKey">
+			<TabPane key="1" tab="支出信息">
+				<Expense />
+			</TabPane>
+			<TabPane key="2" tab="收入信息">
+				<Income />
+			</TabPane>
+		</Tabs>
+	</div>
+</template>
+<script lang="ts" setup name="AboutPage">
+  import { h, ref } from 'vue';
+  import { Tag, Tabs ,TabPane } from 'ant-design-vue';
+  import { PageWrapper } from '@jeesite/core/components/Page';
+  import Expense from './expense/list.vue';
+  import Income from './income/list.vue';
+  const activeKey = ref('1');
+
+</script>
+
+<style scoped lang="less">
+// 整体容器样式
+.web-page-container {
+  width: 100%;
+  background-color: #e8f4f8;
+  display: flex;
+  flex-direction: column; // 垂直布局
+  overflow: hidden; // 防止内容溢出
+}
+
+</style>
\ No newline at end of file
diff --git a/web-vue/packages/erp/views/erp/transactionFlow/form.vue b/web-vue/packages/erp/views/erp/transactionFlow/form.vue
index b7a587a9..663842f5 100644
--- a/web-vue/packages/erp/views/erp/transactionFlow/form.vue
+++ b/web-vue/packages/erp/views/erp/transactionFlow/form.vue
@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:transactionFlow:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="70%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpTransactionFlowForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { ErpCategory, erpCategoryListAll } from '@jeesite/erp/api/erp/category';
   import { ErpTransactionFlow, erpTransactionFlowSave, erpTransactionFlowForm } from '@jeesite/erp/api/erp/transactionFlow';
 
@@ -118,20 +118,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpTransactionFlowForm(data);
     record.value = (res.erpTransactionFlow || {}) as ErpTransactionFlow;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         flowId: record.value.flowId || data.flowId,
@@ -139,7 +139,7 @@
       // console.log('submit', params, data, record);
       const res = await erpTransactionFlowSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -147,7 +147,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>
diff --git a/web-vue/packages/erp/views/erp/transactionFlow/list.vue b/web-vue/packages/erp/views/erp/transactionFlow/list.vue
index 983e9b0f..1c1fe66e 100644
--- a/web-vue/packages/erp/views/erp/transactionFlow/list.vue
+++ b/web-vue/packages/erp/views/erp/transactionFlow/list.vue
@@ -19,7 +19,7 @@
         </a-button>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -34,7 +34,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpTransactionFlow, erpTransactionFlowList } from '@jeesite/erp/api/erp/transactionFlow';
   import { erpTransactionFlowDelete, erpTransactionFlowFinish, erpTransactionFlowListData } from '@jeesite/erp/api/erp/transactionFlow';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -267,10 +266,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {
@@ -302,8 +301,6 @@
     showMessage(res.message);
     await handleSuccess(record);
   }
-  
-  
 
   async function handleSuccess(record: Recordable) {
     await reload({ record });