diff --git a/src/api/checkCode/index.ts b/src/api/checkCode/index.ts
new file mode 100644
index 0000000..152c693
--- /dev/null
+++ b/src/api/checkCode/index.ts
@@ -0,0 +1,126 @@
+//@ts-ignore js语法检查忽略
+import request from '@/utils/request';
+
+// 生成条码
+export function addObj(query?: Object) {
+  return request({
+    url: 'zyreq/add',
+    method: 'get',
+    params: query,
+  });
+}
+
+
+// 查询申请单列表
+export function fetchCodeList(query?: Object) {
+  return request({
+    url: '/zyreq/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 查询项目
+export function fetchCodeDetail(query?: Object) {
+  return request({
+    url: 'zyreq/detail',
+    method: 'get',
+    params: query,
+  });
+}
+// 执行条码
+export function fetchCodeExec(query?: Object) {
+  return request({
+    url: '/zyreq/exec',
+    method: 'get',
+    params: query,
+  });
+}
+// 执行条码
+export function printSendSample(query?: Object) {
+  return request({
+    url: '/zyreq/printSendSample',
+    method: 'post',
+    data: query,
+  });
+}
+// 获取申请单主表信息
+export function fetchCodeReqmain(query?: Object) {
+  return request({
+    url: 'zyreq/reqmain',
+    method: 'get',
+    params: query,
+  });
+}
+// 查询报告单列表
+export function reportList(query?: Object) {
+  return request({
+    url: '/report/ReportList',
+    method: 'post',
+    data: query,
+  });
+}
+// 查询报告Pdf预览
+export function reportViewPdf(query?: Object) {
+  return request({
+    url: '/report/pdf',
+    method: 'get',
+    params: query,
+  });
+}
+// 查询报告Pdf打印
+export function reportPrintPdf(query?: Object) {
+  return request({
+    url: '/report/print',
+    method: 'post',
+    data: query,
+  });
+}
+// 查询项目报告
+export function reportResult(query?: Object) {
+  return request({
+    url: '/report/result',
+    method: 'post',
+    data: query,
+  });
+}
+// 查询微生物报告
+export function reportMedList(query?: Object) {
+  return request({
+    url: '/report/MedList',
+    method: 'post',
+    data: query,
+  });
+}
+// 查询微生物报告
+export function reportFsresult(query?: Object) {
+  return request({
+    url: '/report/fsresult',
+    method: 'post',
+    data: query,
+  });
+}
+// 打印机插件检查
+export function printcheck(query?: Object) {
+  return request({
+    url: '/zyreq/printcheck',
+    method: 'get',
+    params: query,
+  });
+}
+// 打印机插件设置
+export function printsetup(query?: Object) {
+  return request({
+    url: '/zyreq/printsetup',
+    method: 'get',
+    params: query,
+  });
+}
+// 取消采样
+export function cancelExecSQD(query?: Object) {
+  return request({
+    url: '/zyreq/cancelExecSQD',
+    method: 'post',
+    data: query,
+  });
+}
+
diff --git a/src/api/liswork/xtwh/configdictApi.ts b/src/api/liswork/xtwh/configdictApi.ts
new file mode 100644
index 0000000..1c87a87
--- /dev/null
+++ b/src/api/liswork/xtwh/configdictApi.ts
@@ -0,0 +1,46 @@
+//参数设置字典
+// @ts-ignore
+import request from '@/utils/request'
+
+// 查询字典列表
+export function listconfigdict(params:any) {
+    return request({
+        url: '/configdict/list',
+        method: 'get',
+        params
+    })
+}
+
+// 查询字典详细
+export function getconfigdict(id:number) {
+    return request({
+        url: `/configdict/${id}`,
+        method: 'get'
+    })
+}
+
+// 新增字典
+export function addconfigdict(params:any) {
+    return request({
+        url: '/configdict',
+        method: 'post',
+        data:params
+    })
+}
+
+// 修改字典
+export function updateconfigdict(params:any) {
+    return request({
+        url: '/configdict',
+        method: 'put',
+        data:params
+    })
+}
+
+// 删除字典
+export function delconfigdict(id:any) {
+    return request({
+        url: `/configdict/${id}`,
+        method: 'delete'
+    })
+}
diff --git a/src/api/login.ts b/src/api/login.ts
index b2244f8..37eeaa3 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -20,6 +20,15 @@ export function login(username: string, password: string, code: string, uuid: st
   })
 }
 
+// 单点登录
+export function loginAnonymous(data: { username: string; yljg: string }): Promise<LoginInfoResult> {
+  return request({
+    url: '/loginAnonymous',
+    method: 'post',
+    data: data
+  })
+}
+
 // 注册方法
 export function register(data: SysRegister): Promise<AjaxResult> {
   return request({
diff --git a/src/api/mzcx/cydj.ts b/src/api/mzcx/cydj.ts
new file mode 100644
index 0000000..4cc8470
--- /dev/null
+++ b/src/api/mzcx/cydj.ts
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+// 查询采样登记列表
+export function querySQD(query: Object) {
+  return request({
+    url: '/mzcx/querySQD',
+    method: 'get',
+    params: query
+  })
+}
+// 查询采样登记列表
+export function printBarcode(query: Object) {
+  return request({
+    url: '/mzcx/printBarcode',
+    method: 'get',
+    params: query
+  })
+}
+export function printBarcodeall(data: Object) {
+  return request({
+    url: '/mzcx/printBarcode',
+    method: 'post',
+    data: data
+  })
+}
+// 查询病人列表
+export function queryPatList() {
+  return request({
+    url: '/mzcx/queryPatList',
+    method: 'get'
+  })
+}
+
+// 打印回单
+export function printBackpaper(data: Object) {
+  return request({
+    url: '/mzcx/printBackpaper',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采样登记
+export function updateReqmain(data: Object) {
+  return request({
+    url: '/system/reqmain',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采样登记
+export function delReqmain(sqh: string) {
+  return request({
+    url: '/system/reqmain/' + sqh,
+    method: 'delete'
+  })
+}
diff --git a/src/api/mzcx/index.ts b/src/api/mzcx/index.ts
new file mode 100644
index 0000000..ef65ab3
--- /dev/null
+++ b/src/api/mzcx/index.ts
@@ -0,0 +1,155 @@
+//@ts-ignore js语法检查忽略
+import request from '@/utils/request';
+
+
+// 查询条码类别
+export function feeitemclassList(query?: Object) {
+  return request({
+    url: 'feeitemclass/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 报告领取规则   
+export function rptgetrules(query?: Object) {
+  return request({
+    url: '/rptgetrule/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 新增条码类别   
+export function feeitemclassAdd(query?: Object) {
+  return request({
+    url: '/feeitemclass/add',
+    method: 'post',
+    data: query,
+  });
+}
+// 修改条码类别   
+export function feeitemclassUpdate(query?: Object) {
+  return request({
+    url: '/feeitemclass/update',
+    method: 'post',
+    data: query,
+  });
+}
+// 删除条码类别   
+export function feeitemclassDel(query?: Object) {
+  return request({
+    url: '/feeitemclass/del',
+    method: 'delete',
+    params: query,
+  });
+}
+
+
+
+
+// 收费项目维护列表
+export function xmfeeList(query?: Object) {
+  return request({
+    url: 'xmfee/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 收费项目新增
+export function xmfeeadd(query?: Object) {
+  return request({
+    url: 'xmfee/addXmfee',
+    method: 'post',
+    data: query,
+  });
+}
+// 收费项目修改
+export function xmfeeUpdate(query?: Object) {
+  return request({
+    url: 'xmfee/update',
+    method: 'post',
+    data: query,
+  });
+}
+// 收费项目删除
+export function xmfeeDel(query?: Object) {
+  return request({
+    url: 'xmfee/del',
+    method: 'delete',
+    params: query,
+  });
+}
+
+
+
+// 报告领取规则维护列表
+export function rptgetruleList(query?: Object) {
+  return request({
+    url: 'rptgetrule/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 报告领取规则明细列表
+export function rptgetruleDetail(query?: Object) {
+  return request({
+    url: 'rptgetrule/queryDetail',
+    method: 'get',
+    params: query,
+  });
+}
+// 报告领取规则新增
+export function rptgetruleadd(query?: Object) {
+  return request({
+    url: 'rptgetrule/add',
+    method: 'post',
+    data: query,
+  });
+}
+// 报告领取规则修改
+export function rptgetruleUpdate(query?: Object) {
+  return request({
+    url: 'rptgetrule/update',
+    method: 'post',
+    data: query,
+  });
+}
+// 报告领取规则删除
+export function rptgetruleDel(query?: Object) {
+  return request({
+    url: 'rptgetrule/del',
+    method: 'delete',
+    params: query,
+  });
+}
+// 报告领取规则明细删除
+export function rptgetruleDelDetail(query?: Object) {
+  return request({
+    url: 'rptgetrule/delDetail',
+    method: 'delete',
+    params: query,
+  });
+}
+// 查询条码类别与项目对照
+export function feeitemvsList(query?: Object) {
+  return request({
+    url: '/feeitemvsclass/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 保存对照的项目
+export function feeitemvAdd(query?: Object) {
+  return request({
+    url: '/feeitemvsclass/add',
+    method: 'post',
+    data: query,
+  });
+}
+// 保存对照的项目
+export function feeitemvDel(query?: Object) {
+  return request({
+    url: '/feeitemvsclass/del',
+    method: 'delete',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/regional/dict/diagnosis.js b/src/api/regional/dict/diagnosis.js
new file mode 100644
index 0000000..3c2f72d
--- /dev/null
+++ b/src/api/regional/dict/diagnosis.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询诊断列表
+export function listdiagnosis(query) {
+    return request({
+        url: '/transitdict/diagnosis/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询诊断详细
+export function getdiagnosis(diagnosisId) {
+    return request({
+        url: '/transitdict/diagnosis/' + diagnosisId,
+        method: 'get'
+    })
+}
+
+// 新增诊断
+export function adddiagnosis(data) {
+    return request({
+        url: '/transitdict/diagnosis',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改诊断
+export function updatediagnosis(data) {
+    return request({
+        url: '/transitdict/diagnosis',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除诊断
+export function deldiagnosis(diagnosisId) {
+    return request({
+        url: '/transitdict/diagnosis/' + diagnosisId,
+        method: 'delete'
+    })
+}
diff --git a/src/api/regional/dict/hospital.js b/src/api/regional/dict/hospital.js
new file mode 100644
index 0000000..797dfd6
--- /dev/null
+++ b/src/api/regional/dict/hospital.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询医疗机构列表
+export function listhospital(query) {
+    return request({
+        url: '/transitdict/hospital/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询医疗机构详细
+export function gethospital(hospitalId) {
+    return request({
+        url: '/transitdict/hospital/' + hospitalId,
+        method: 'get'
+    })
+}
+
+// 新增医疗机构
+export function addhospital(data) {
+    return request({
+        url: '/transitdict/hospital',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改医疗机构
+export function updatehospital(data) {
+    return request({
+        url: '/transitdict/hospital',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除医疗机构
+export function delhospital(hospitalId) {
+    return request({
+        url: '/transitdict/hospital/' + hospitalId,
+        method: 'delete'
+    })
+}
diff --git a/src/api/regional/dict/itemclass.js b/src/api/regional/dict/itemclass.js
new file mode 100644
index 0000000..44b6fa3
--- /dev/null
+++ b/src/api/regional/dict/itemclass.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询诊断列表
+export function listitemclass(query) {
+    return request({
+        url: '/transitdict/itemclass/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询诊断详细
+export function getitemclass(itemclassId) {
+    return request({
+        url: '/transitdict/itemclass/' + itemclassId,
+        method: 'get'
+    })
+}
+
+// 新增诊断
+export function additemclass(data) {
+    return request({
+        url: '/transitdict/itemclass',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改诊断
+export function updateitemclass(data) {
+    return request({
+        url: '/transitdict/itemclass',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除诊断
+export function delitemclass(itemclassId) {
+    return request({
+        url: '/transitdict/itemclass/' + itemclassId,
+        method: 'delete'
+    })
+}
diff --git a/src/api/regional/dict/regdict.js b/src/api/regional/dict/regdict.js
new file mode 100644
index 0000000..57c3ffb
--- /dev/null
+++ b/src/api/regional/dict/regdict.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询字典列表
+export function listregdict(query) {
+    return request({
+        url: '/transitdict/regdict/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询字典详细
+export function getregdict(regdictId) {
+    return request({
+        url: '/transitdict/regdict/' + regdictId,
+        method: 'get'
+    })
+}
+
+// 新增字典
+export function addregdict(data) {
+    return request({
+        url: '/transitdict/regdict',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改字典
+export function updateregdict(data) {
+    return request({
+        url: '/transitdict/regdict',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除字典
+export function delregdict(regdictId) {
+    return request({
+        url: '/transitdict/regdict/' + regdictId,
+        method: 'delete'
+    })
+}
diff --git a/src/api/regional/index.ts b/src/api/regional/index.ts
new file mode 100644
index 0000000..9b302ea
--- /dev/null
+++ b/src/api/regional/index.ts
@@ -0,0 +1,59 @@
+// @ts-ignore
+import request from '@/utils/request'
+
+// 获取流转数据
+export function querySample(query?: Object) {
+  return request({
+    url: '/transit/querySample',
+    method: 'get',
+    params: query
+  })
+}
+// 获取未签收的标本
+export function querySampleSign(query?: Object) {
+  return request({
+    url: '/transit/querySampleSign',
+    method: 'get',
+    params: query
+  })
+}
+// 签收标本
+export function sampleSign(query?: Object) {
+  return request({
+    url: '/transit/sampleSign',
+    method: 'post',
+    data: query
+  })
+}
+// 退回的标本
+export function querySampleSignBack(query?: Object) {
+  return request({
+    url: '/transit/querySampleSignBack',
+    method: 'get',
+    params: query
+  })
+}
+// 标本报表
+export function sampleTypeCount(query?: Object) {
+  return request({
+    url: '/transitReport/sampleTypeCount',
+    method: 'get',
+    params: query
+  })
+}
+// 标本报表费用
+export function sampleitemCount(query?: Object) {
+  return request({
+    url: '/transitReport/itemCount',
+    method: 'get',
+    params: query
+  })
+}
+// 标本报表费用
+export function getallcount(query?: Object) {
+  return request({
+    url: '/transitstat/getallcount',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/assets/images/xjt.png b/src/assets/images/xjt.png
new file mode 100644
index 0000000..c641ad5
Binary files /dev/null and b/src/assets/images/xjt.png differ
diff --git a/src/assets/images/yjt.png b/src/assets/images/yjt.png
new file mode 100644
index 0000000..0aec41f
Binary files /dev/null and b/src/assets/images/yjt.png differ
diff --git a/src/router/index.ts b/src/router/index.ts
index 5b89721..2541e79 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -47,6 +47,12 @@ export const constantRoutes = [
     component: () => import('@/views/register.vue'),
     hidden: true
   },
+  // 大屏
+  {
+    path: '/regional/statistics/overview',
+    component: () => import('@/views/regional/statistics/overview/index.vue'),
+    hidden: true
+  },
   {
     path: "/:pathMatch(.*)*",
     component: () => import('@/views/error/404.vue'),
diff --git a/src/store/modules/printStore.ts b/src/store/modules/printStore.ts
new file mode 100644
index 0000000..f410c28
--- /dev/null
+++ b/src/store/modules/printStore.ts
@@ -0,0 +1,36 @@
+// 打印状态管理
+import { defineStore } from 'pinia'
+
+export const usePrintStore = defineStore('printStore', {
+  state: () => ({
+    isConnected: false, // 存储连接状态
+    clientInfo: null,   // 存储客户端信息
+    printerList: [] as any[], // 存储打印机列表
+    defaultPrinter: '' as string, // 存储默认打印机名称
+  }),
+  actions: {
+    setConnected(status: boolean) {
+      this.isConnected = status
+    },
+    setClientInfo(info: any) {
+      this.clientInfo = info
+    },
+    setPrinterList(list: any[]) {
+      this.printerList = list
+    },
+
+    setDefaultPrinter(printerName: string) {
+      this.defaultPrinter = printerName
+    }
+  },
+
+  // 持久化配置
+  persist: {
+    // 指定要持久化的状态字段
+    pick: ['defaultPrinter',],
+    // 可选配置：自定义存储键名（默认是store的id）
+    // key: 'common_store',
+    // 可选配置：指定存储位置（默认是localStorage 也可以用sessionStorage）
+    storage: localStorage,
+  }
+})
\ No newline at end of file
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 9ff4a82..ee0e104 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,6 +1,6 @@
 import router from '@/router'
 import { ElMessageBox } from 'element-plus'
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo, loginAnonymous } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { isHttp, isEmpty } from "@/utils/validate"
 import defAva from '@/assets/images/profile.jpg'
@@ -28,6 +28,24 @@ const useUserStore = defineStore(
       permissions: []
     }),
     actions: {
+      // 单点登录
+      loginAnonymous(data: { name: string; yljg: string }) {
+        return new Promise((resolve, reject) => {
+          loginAnonymous({
+            username: data.name,
+            yljg: data.yljg
+          }).then(res => {
+            if (res.code == 200) {
+              setToken(res.token)
+              this.token = res.token
+              resolve(true)
+            }
+
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
       // 登录
       login(userInfo: { username: string; password: string; code: string; uuid: string }) {
         const username = userInfo.username.trim()
@@ -64,16 +82,16 @@ const useUserStore = defineStore(
             this.nickName = user.nickName || ''
             this.avatar = avatar
             /* 初始密码提示 */
-            if(res.isDefaultModifyPwd) {
-              ElMessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
+            if (res.isDefaultModifyPwd) {
+              ElMessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
                 router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
-              }).catch(() => {})
+              }).catch(() => { })
             }
             /* 过期密码提示 */
-            if(!res.isDefaultModifyPwd && res.isPasswordExpired) {
-              ElMessageBox.confirm('您的密码已过期，请尽快修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
+            if (!res.isDefaultModifyPwd && res.isPasswordExpired) {
+              ElMessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
                 router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
-              }).catch(() => {})
+              }).catch(() => { })
             }
             resolve(res)
           }).catch(error => {
diff --git a/src/utils/printHelper.ts b/src/utils/printHelper.ts
new file mode 100644
index 0000000..88ae907
--- /dev/null
+++ b/src/utils/printHelper.ts
@@ -0,0 +1,50 @@
+/**
+ * @file printHelper.ts 检查打印服务连接状态
+ * @author: w
+ * @since: 2026-01-26
+ */
+
+import { ElMessageBox, ElMessage } from 'element-plus'
+import { printcheck } from '@/api/checkCode/index'
+//  @ts-ignore
+import Download from '@/plugins/download'
+
+
+export const checkPrintService = async (): Promise<boolean> => { //连接成功返回true，失败返回false
+  try {
+    const res = await printcheck()
+    if (res.code == 0) {
+      return true
+    } else {
+      await showPrintServiceError(res.msg)
+      return false
+    }
+  } catch (error) {
+    console.error('打印服务检查失败：', error)
+    await showPrintServiceError('打印服务连接异常')
+    return false
+  }
+}
+
+
+export const showPrintServiceError = async (msg: string) => {
+  // 挂载downExe方法到window，供提示框内的onclick调用
+  if (!(window as any).downExe) {
+    (window as any).downExe = () => {
+      Download.name('lisprintsetup.exe', false)
+    }
+  }
+
+  await ElMessageBox.alert(
+    `${msg}！<br>请确保目标服务器已<a style="color: #1f79db" onclick="downExe()">下载安装</a> 并运行打印服务！`,
+    "客户端未连接",
+    {
+      dangerouslyUseHTMLString: true,
+    }
+  )
+}
+
+//触发打印服务安装包下载
+export const downloadPrintSetup = () => {
+  Download.name('lisprintsetup.exe', false)
+}
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index acf6f07..7deb6f9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,1168 +1,12 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            icon="Cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            icon="HomeFilled"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
+  <div>
 
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>联系信息</span>
-            </div>
-          </template>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
-              <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
-              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s> 
-              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s> 
-              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s> 
-              <s> 满161281055 </s> <s> 满138988063 </s> <s> 满151450850 </s> <s> 满224622315 </s>
-              <s> 满287842588 </s> <s> 满187944233 </s> <s> 满228578329 </s> <s> 满191164766 </s>
-              <s> 满174569686 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=M9y5NjAl44lAL_Vh2crmEehZU_PMU6KS&authKey=ZSDz8hEREWSaPuxQV3gEwqGIaGjfRNnkB4rJjf0IvXhrSUGSGwQFmBA%2Boe8HFxyl&noverify=0&group_code=127358632" target="_blank">127358632</a>
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>更新日志</span>
-            </div>
-          </template>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.9.1 - 2025-12-18">
-              <ol>
-                <li>支持防盗链功能</li>
-                <li>菜单导航设置支持纯顶部</li>
-                <li>使用yauaa代替bitwalker</li>
-                <li>用户头像更换后移除旧头像文件</li>
-                <li>支持Excel导出对象的多个子列表</li>
-                <li>升级oshi到最新版本6.9.1</li>
-                <li>升级druid到最新版本1.2.27</li>
-                <li>升级fastjson到最新版2.0.60</li>
-                <li>升级spring-security到5.7.14</li>
-                <li>升级tomcat到最新版本9.0.112</li>
-                <li>升级commons.io到最新版本2.21.0</li>
-                <li>用户导入添加验证提示</li>
-                <li>显示列信息支持对象格式</li>
-                <li>忽略用户密码字段的JSON序列化</li>
-                <li>网页标题设置新增SET_TITLE方法</li>
-                <li>自动识别json对象白名单配置范围缩小</li>
-                <li>登录/注册页面底部版权信息修改为读取配置</li>
-                <li>修复用户归属部门无法修改为空问题</li>
-                <li>修复固定头部时出现的导航栏偏移问题</li>
-                <li>修复v3时间控件between选择后清空报错问题</li>
-                <li>修复comboReadDict属性下多个sheet出现的报错</li>
-                <li>修复表单构建移除所有控件后切换路由回来空白问题</li>
-                <li>优化布局设置显示</li>
-                <li>优化字典组件值宽松匹配</li>
-                <li>优化获取字典类型值的方法</li>
-                <li>优化生成代码下载的zip文件名</li>
-                <li>优化日志记录参数拼装提升效率</li>
-                <li>优化导入文件检查标题行不能为空</li>
-                <li>优化表单构建关闭页签销毁复制插件</li>
-                <li>优化Excel统计行数值的单元格样式显示</li>
-                <li>优化数据权限控制逻辑，放开permission限制</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.9.0 - 2025-05-28">
-              <ol>
-                <li>优化菜单搜索查询页</li>
-                <li>导航栏显示昵称&设置</li>
-                <li>菜单管理新增路由名称</li>
-                <li>添加底部版权信息&开关</li>
-                <li>分配角色禁用不允许勾选</li>
-                <li>Excel导入导出支持多图片</li>
-                <li>添加页签图标显示开关功能</li>
-                <li>上传组件新增拖动排序属性</li>
-                <li>显隐列组件支持全选/全不选</li>
-                <li>初始密码支持自定义修改策略</li>
-                <li>账号密码支持自定义更新周期</li>
-                <li>代码生成列表支持按时间排序</li>
-                <li>支持富文本复制粘贴图片上传至url</li>
-                <li>支持文件&图片组件自定义地址&参数</li>
-                <li>升级tomcat到最新版本9.0.105</li>
-                <li>升级oshi到最新版本6.8.1</li>
-                <li>升级fastjson到最新版2.0.57</li>
-                <li>升级commons.io到最新版本2.19.0</li>
-                <li>package.json移除runjs依赖</li>
-                <li>package.json移除eslint依赖</li>
-                <li>package.json移除vue-meta依赖</li>
-                <li>修复代码生成主子表校验必填失效问题</li>
-                <li>优化前端树结构性能问题</li>
-                <li>优化前端处理路由函数代码</li>
-                <li>优化文件上传组件新增类型</li>
-                <li>优化顶部菜单搜索栏为多层级显示</li>
-                <li>优化文件&图片上传组件新增disabled属性</li>
-                <li>优化空指针异常时无法获取错误信息问题</li>
-                <li>优化定时任务字符包含多个括号导致数据错误</li>
-                <li>优化登录&注册页表头使用VUE_APP_TITLE配置值</li>
-                <li>优化导出Excel日期格式双击离开后与设定的格式不一致问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.9 - 2024-12-30">
-              <ol>
-                <li>用户管理支持分栏拖动</li>
-                <li>修改主题样式本地读取</li>
-                <li>用户头像http(s)链接支持</li>
-                <li>用户管理过滤掉已禁用部门</li>
-                <li>支持自定义显示Excel属性列</li>
-                <li>操作日志记录DELETE请求参数</li>
-                <li>白名单支持对通配符路径匹配</li>
-                <li>校检文件名是否包含特殊字符</li>
-                <li>代码生成创建表屏蔽违规的字符</li>
-                <li>菜单面包屑导航支持多层级显示</li>
-                <li>Excel注解支持wrapText是否允许内容换行</li>
-                <li>代码生成新增配置是否允许文件覆盖到本地</li>
-                <li>修复角色禁用权限不失效问题</li>
-                <li>修复代码生成上级菜单显示问题</li>
-                <li>修复导出子列表对象只能在最后的问题</li>
-                <li>修复TopNav无法正确获取active的问题</li>
-                <li>修复默认关闭Tags-Views内链页面打不开</li>
-                <li>升级oshi到最新版本6.6.5</li>
-                <li>升级tomcat到最新版本9.0.96</li>
-                <li>升级fastjson到最新版2.0.53</li>
-                <li>升级logback到最新版本1.2.13</li>
-                <li>升级spring-framework到最新版本5.3.39</li>
-                <li>升级quill到最新版本2.0.2</li>
-                <li>升级axios到最新版本0.28.1</li>
-                <li>优化身份证脱敏正则</li>
-                <li>优化权限更新后同步缓存</li>
-                <li>优化查询时间范围日期格式</li>
-                <li>优化参数键值更换为多行文本</li>
-                <li>优化导入带标题文件关闭清理</li>
-                <li>优化上传图片带域名不增加前缀</li>
-                <li>优化特殊字符密码修改失败问题</li>
-                <li>优化无用户编号不校验数据权限</li>
-                <li>优化TopNav内链菜单点击没有高亮</li>
-                <li>优化菜单管理切换Mini布局错乱问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.8 - 2024-06-30">
-              <ol>
-                <li>菜单管理新增路由名称</li>
-                <li>新增数据脱敏过滤注解</li>
-                <li>用户密码新增非法字符验证</li>
-                <li>限制用户操作数据权限范围</li>
-                <li>代码生成新增创建表结构功能</li>
-                <li>定时任务白名单配置范围缩小</li>
-                <li>优化代码生成主子表关联查询方式</li>
-                <li>Excel注解新增属性comboReadDict</li>
-                <li>Excel注解ColumnType类型新增文本</li>
-                <li>新增国际化资源文件配置</li>
-                <li>升级oshi到最新版本6.6.1</li>
-                <li>升级druid到最新版本1.2.23</li>
-                <li>升级core-js到最新版本3.37.1</li>
-                <li>更新HttpUtils中的User-Agent</li>
-                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
-                <li>升级spring-security到安全版本，防止漏洞风险</li>
-                <li>升级spring-framework到安全版本，防止漏洞风险</li>
-                <li>优化自定义XSS注解匹配方式</li>
-                <li>优化缓存监控键名列表排序显示</li>
-                <li>优化定时任务日志默认按时间排序</li>
-                <li>优化默认文件大小超过2G无效的问题</li>
-                <li>优化查表特殊字符使用反斜杠进行转义</li>
-                <li>优化定时任务cron表达式小时配置显示错误问题</li>
-                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
-                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.7 - 2023-12-08">
-              <ol>
-                <li>操作日志记录部门名称</li>
-                <li>全局数据存储用户编号</li>
-                <li>新增编程式判断资源访问权限</li>
-                <li>操作日志列表新增IP地址查询</li>
-                <li>定时任务新增页去除状态选项</li>
-                <li>代码生成支持选择前端模板类型</li>
-                <li>显隐列组件支持复选框弹出类型</li>
-                <li>通用排序属性orderBy参数限制长度</li>
-                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
-                <li>升级oshi到最新版本6.4.8</li>
-                <li>升级druid到最新版本1.2.20</li>
-                <li>升级fastjson到最新版2.0.43</li>
-                <li>升级pagehelper到最新版1.4.7</li>
-                <li>升级commons.io到最新版本2.13.0</li>
-                <li>升级element-ui到最新版本2.15.14</li>
-                <li>修复五级路由缓存无效问题</li>
-                <li>修复外链带端口出现的异常</li>
-                <li>修复树模板父级编码变量错误</li>
-                <li>修复字典表详情页面搜索问题</li>
-                <li>修复内链iframe没有传递参数问题</li>
-                <li>修复自定义字典样式不生效的问题</li>
-                <li>修复字典缓存删除方法参数错误问题</li>
-                <li>修复Excel导入数据临时文件无法删除问题</li>
-                <li>修复未登录带参数访问成功后参数丢失问题</li>
-                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
-                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
-                <li>修复Excels导入时无法获取到dictType字典值问题</li>
-                <li>优化下载zip方法新增遮罩层</li>
-                <li>优化头像上传参数新增文件名称</li>
-                <li>优化字典标签支持自定义分隔符</li>
-                <li>优化菜单管理类型为按钮状态可选</li>
-                <li>优化前端防重复提交数据大小限制</li>
-                <li>优化TopNav菜单没有图标svg不显示</li>
-                <li>优化数字金额大写转换精度丢失问题</li>
-                <li>优化富文本Editor组件检验图片格式</li>
-                <li>优化页签在Firefox浏览器被遮挡的问题</li>
-                <li>优化个人中心/基本资料修改时数据显示问题</li>
-                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.6 - 2023-06-30">
-              <ol>
-                <li>支持登录IP黑名单限制</li>
-                <li>新增监控页面图标显示</li>
-                <li>操作日志新增消耗时间属性</li>
-                <li>屏蔽定时任务bean违规的字符</li>
-                <li>日志管理使用索引提升查询性能</li>
-                <li>日志注解支持排除指定的请求参数</li>
-                <li>支持自定义隐藏属性列过滤子对象</li>
-                <li>升级oshi到最新版本6.4.3</li>
-                <li>升级druid到最新版本1.2.16</li>
-                <li>升级fastjson到最新版2.0.34</li>
-                <li>升级spring-boot到最新版本2.5.15</li>
-                <li>升级element-ui到最新版本2.15.13</li>
-                <li>移除apache/commons-fileupload依赖</li>
-                <li>修复页面切换时布局错乱的问题</li>
-                <li>修复匿名注解Anonymous空指针问题</li>
-                <li>修复路由跳转被阻止时内部产生报错信息问题</li>
-                <li>修复isMatchedIp的参数判断产生空指针的问题</li>
-                <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
-                <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
-                <li>修复DictTag组件value没有匹配的值时则展示value</li>
-                <li>优化文件下载出现的异常</li>
-                <li>优化选择图标组件高亮回显</li>
-                <li>优化弹窗后导航栏偏移的问题</li>
-                <li>优化修改密码日志存储明文问题</li>
-                <li>优化页签栏关闭其他出现的异常问题</li>
-                <li>优化页签关闭左侧选项排除首页选项</li>
-                <li>优化关闭当前tab页跳转最右侧tab页</li>
-                <li>优化缓存列表清除操作提示不变的问题</li>
-                <li>优化字符未使用下划线不进行驼峰式处理</li>
-                <li>优化用户导入更新时需获取用户编号问题</li>
-                <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
-                <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
-                <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.5 - 2023-01-01">
-              <ol>
-                <li>定时任务违规的字符</li>
-                <li>重置时取消部门选中</li>
-                <li>新增返回警告消息提示</li>
-                <li>忽略不必要的属性数据返回</li>
-                <li>修改参数键名时移除前缓存配置</li>
-                <li>导入更新用户数据前校验数据权限</li>
-                <li>兼容Excel下拉框内容过多无法显示的问题</li>
-                <li>升级echarts到最新版本5.4.0</li>
-                <li>升级core-js到最新版本3.25.3</li>
-                <li>升级oshi到最新版本6.4.0</li>
-                <li>升级kaptcha到最新版2.3.3</li>
-                <li>升级druid到最新版本1.2.15</li>
-                <li>升级fastjson到最新版2.0.20</li>
-                <li>升级pagehelper到最新版1.4.6</li>
-                <li>优化弹窗内容过多展示不全问题</li>
-                <li>优化swagger-ui静态资源使用缓存</li>
-                <li>开启TopNav没有子菜单隐藏侧边栏</li>
-                <li>删除fuse无效选项maxPatternLength</li>
-                <li>优化导出对象的子列表为空会出现[]问题</li>
-                <li>优化编辑头像时透明部分会变成黑色问题</li>
-                <li>优化小屏幕上修改头像界面布局错位的问题</li>
-                <li>修复代码生成勾选属性无效问题</li>
-                <li>修复文件上传组件格式验证问题</li>
-                <li>修复回显数据字典数组异常问题</li>
-                <li>修复sheet超出最大行数异常问题</li>
-                <li>修复Log注解GET请求记录不到参数问题</li>
-                <li>修复调度日志点击多次数据不变化的问题</li>
-                <li>修复主题颜色在Drawer组件不会加载问题</li>
-                <li>修复文件名包含特殊字符的文件无法下载问题</li>
-                <li>修复table中更多按钮切换主题色未生效修复问题</li>
-                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
-                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
-                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.4 - 2022-09-26">
-              <ol>
-                <li>数据逻辑删除不进行唯一验证</li>
-                <li>Excel注解支持导出对象的子列表方法</li>
-                <li>Excel注解支持自定义隐藏属性列</li>
-                <li>Excel注解支持backgroundColor属性设置背景色</li>
-                <li>支持配置密码最大错误次数/锁定时间</li>
-                <li>登录日志新增解锁账户功能</li>
-                <li>通用下载方法新增config配置选项</li>
-                <li>支持多权限字符匹配角色数据权限</li>
-                <li>页面内嵌iframe切换tab不刷新数据</li>
-                <li>操作日志记录支持排除敏感属性字段</li>
-                <li>修复多文件上传报错出现的异常问题</li>
-                <li>修复图片预览组件src属性为null值控制台报错问题</li>
-                <li>升级oshi到最新版本6.2.2</li>
-                <li>升级fastjson到最新版2.0.14</li>
-                <li>升级pagehelper到最新版1.4.3</li>
-                <li>升级core-js到最新版本3.25.2</li>
-                <li>升级element-ui到最新版本2.15.10</li>
-                <li>优化任务过期不执行调度</li>
-                <li>优化字典数据使用store存取</li>
-                <li>优化修改资料头像被覆盖的问题</li>
-                <li>优化修改用户登录账号重复验证</li>
-                <li>优化代码生成同步后值NULL问题</li>
-                <li>优化定时任务支持执行父类方法</li>
-                <li>优化用户个人信息接口防止修改部门</li>
-                <li>优化布局设置使用el-drawer抽屉显示</li>
-                <li>优化没有权限的用户编辑部门缺少数据</li>
-                <li>优化日志注解记录限制请求地址的长度</li>
-                <li>优化excel/scale属性导出单元格数值类型</li>
-                <li>优化日志操作中重置按钮时重复查询的问题</li>
-                <li>优化多个相同角色数据导致权限SQL重复问题</li>
-                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>捐赠支持</span>
-            </div>
-          </template>
-          <div class="body">
-            <img
-              src="@/assets/images/pay.png"
-              alt="donate"
-              style="width:100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
   </div>
 </template>
 
-<script setup lang="ts" name="Index">
-const version = ref<string>('3.9.1')
+<script setup>
+
 
-function goTarget(url: string): void {
-  window.open(url, '__blank')
-}
 </script>
 
-<style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
-    }
-  }
-
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
-  }
-}
-</style>
-
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/liswork/Issueorder/index.vue b/src/views/liswork/Issueorder/index.vue
index 8ac701d..6ebd461 100644
--- a/src/views/liswork/Issueorder/index.vue
+++ b/src/views/liswork/Issueorder/index.vue
@@ -1,7 +1,7 @@
 /**
 * @file index.vue 科内开单
 * @author: w
-* @since: 2026-03-02
+* @since: 2026-03-09
 */
 
 <template>
@@ -86,21 +86,8 @@
               :scrollYConfig="{ enabled: true, rSize: 30, height: '100%', }" :row-style="rowStyle"
               :cell-style="cellStyle" class="mytable-style" ref="tableRef" :enable-column-drag="true"
               @column-drag-end="handleColumnDragEnd">
-              <template #brxb="{ row }">
-                {{ formatDict(row.brxb, 'SX') }}
-              </template>
-              <template #nldw="{ row }">
-                {{ formatDict(row.nldw, 'AU') }}
-              </template>
-              <template #yblx="{ row }">
-                {{ formatDict(row.yblx, 'BT') }}
-              </template>
-
-              <template #ksdh="{ row }">
-                {{ formatDict(row.ksdh, 'DP') }}
-              </template>
-              <template #brly="{ row }">
-                {{ formatDict(row.brly, 'PT') }}
+              <template #sqys="{ row }">
+                {{ row.sqys }}
               </template>
               <template #zt="{ row }">
                 {{ formatDictzt(row.zt) }}
@@ -132,12 +119,17 @@ const searchKey = ref('')
 const loading = ref(false)
 const tableRef = useTemplateRef('tableRef')
 const labPatList = ref([])
-const searchForm = ref({})
+const searchForm = ref({
+  brxm: '',
+  zt: '',
+  days: 0,
+  begdate: dayjs().format('YYYY-MM-DD'),
+})
 const tableColumns = ref([
   { field: 'brxm', title: '姓名', width: 40, align: 'center', resizable: true, },
   { field: 'zt', title: '状态', width: 40, align: 'center', slotName: 'zt', resizable: true, },
   { field: 'sqsj', title: '登记时间', width: 80, align: 'center', resizable: true },
-  { field: 'sqr', title: '登记人', width: 80, align: 'center', resizable: true },
+  { field: 'sqys', title: '登记人', width: 80, align: 'center', slotName: 'sqys', resizable: true },
   { field: 'jymd', title: '项目', align: 'center', resizable: true },
 ])
 
@@ -150,7 +142,7 @@ const cellStyle = ({ row, column }) => {
 const handleRowClick = (row) => {
   queryPatDetail({ sqh: row.sqh }).then(res => {
     labpat.value = res.data.labReqmain
-    labpat.value.zt = labpat.value.zt.trim()
+    labpat.value.zt = labpat.value.zt?.trim()
     sqXmList.value = res.data.reqInputLisWorkVOList
     checkboxs.value = res.data.reqInputLisWorkVOList.map(item => item.sfxmdh)
   })
@@ -304,7 +296,6 @@ const formatDictzt = (value) => {
 }
 
 onMounted(() => {
-  searchForm.value.begdate = dayjs().format('YYYY-MM-DD')
   getXmList()
   getDictData('PT', 'SX', 'AU', 'BT', 'DP', 'SRD', 'ZJLX')
 })
@@ -347,7 +338,6 @@ onMounted(() => {
 }
 
 .xmBoxs {
-  :deep(.el-checkbox__label) {}
 
   height: 60%;
   overflow-y: auto;
diff --git a/src/views/liswork/xtwh/components/DynamicInput.vue b/src/views/liswork/xtwh/components/DynamicInput.vue
new file mode 100644
index 0000000..68fb9a3
--- /dev/null
+++ b/src/views/liswork/xtwh/components/DynamicInput.vue
@@ -0,0 +1,441 @@
+<template>
+  <div class="dynamic-input-container">
+    <!-- 1. 开关组件（替代原单选框 type=0：是/否 → 开启/关闭） -->
+    <el-switch
+        class="custom-switch"
+        v-if="type === '0'"
+        v-model="innerValue"
+        active-color="#13ce66"
+        inactive-color="#ff4949"
+        active-value="1"
+        inactive-value="0"
+        @change="handleSwitchChange"
+    />
+
+    <!-- 2. 下拉框（1）：直接绑定value -->
+    <el-select
+        v-else-if="type === '1'"
+        v-model="innerValue"
+        size="small"
+        clearable
+        @change="handleValueChange"
+    >
+      <el-option
+          v-for="item in dictOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+      />
+    </el-select>
+
+    <!-- 3. 字典单选（2）：绑定zddh（value），显示zdmc（label） -->
+    <el-select
+        v-else-if="type === '2'"
+        v-model="innerValue"
+        size="small"
+        clearable
+        @change="handleValueChange"
+        v-loading="dictLoading"
+    >
+      <el-option
+          v-for="item in dictOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+      />
+    </el-select>
+
+    <!-- 4. 字典多选（3）：数组↔逗号分隔字符串 → 修复核心：仅绑定multipleValue，移除冗余逻辑 -->
+    <el-select
+        v-else-if="type === '3'"
+        v-model="multipleValue"
+        size="small"
+        multiple
+        @change="handleMultipleChange"
+        v-loading="dictLoading"
+        clearable
+    >
+      <el-option
+          v-for="item in dictOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+      />
+    </el-select>
+
+    <!-- 5. 特殊（4） -->
+    <el-input
+        v-else-if="type === '4'"
+        v-model="innerValue"
+        size="small"
+        disabled
+        @change="handleValueChange"
+    />
+
+    <!-- 6. 文本框（5） -->
+    <el-input
+        v-else-if="type === '5'"
+        v-model="innerValue"
+        size="small"
+        :placeholder="placeholder"
+        @change="handleValueChange"
+    />
+
+    <!-- 7. 数字框（6）：支持dictData定义小数位数，空值初始化 -->
+    <el-input-number
+        v-else-if="type === '6'"
+        v-model="innerValue"
+        size="small"
+        :min="minNum"
+        :precision="finalPrecision"
+        controls-position="right"
+        @change="handleValueChange"
+        :placeholder="placeholder || '请输入数字'"
+    />
+
+    <!-- 8. 日期框（7）：适配yyyy/mm/dd -->
+    <el-date-picker
+        v-else-if="type === '7'"
+        v-model="innerValue"
+        size="small"
+        type="date"
+        format="YYYY/MM/DD"
+        value-format="YYYY-MM-DD"
+        :placeholder="placeholder"
+        @change="handleValueChange"
+    />
+
+    <!-- 9. 时间框（8）：适配hh:mm（修复标签闭合问题） -->
+    <el-time-picker
+        v-else-if="type === '8'"
+        v-model="innerValue"
+        size="small"
+        format="HH:mm"
+        value-format="HH:mm:ss"
+        :placeholder="placeholder"
+        @change="handleValueChange"
+        :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+    />
+
+    <!-- 兜底：默认文本框 -->
+    <el-input
+        v-else
+        v-model="innerValue"
+        size="small"
+        :placeholder="placeholder"
+        @change="handleValueChange"
+    />
+  </div>
+</template>
+
+<script setup name="DynamicInput">
+import { ref, watch, defineProps, defineEmits, onMounted, computed } from "vue";
+import { ElMessage } from "element-plus";
+import { getoptionselect } from "@/api/liswork/xtwh/localconfigApi.ts";
+
+// 字典缓存：key=字典类型，value=映射后的{label,value}列表
+const dictCache = ref({});
+
+// Props定义
+const props = defineProps({
+  modelValue: { // Vue3 规范：v-model 绑定 modelValue
+    type: [String, Number, Boolean, null, undefined], // 新增null/undefined支持空值
+    required: false, // 允许空值
+    default: ""
+  },
+  type: { type: String, required: true, default: "5" },
+  dictData: { type: [String, Number, Object, Array], default: "" }, // 支持Number类型（小数位数）
+  placeholder: { type: String, default: "请输入值" },
+  minNum: { type: Number, default: -Infinity }, // 数字框最小值改为无限制（空值场景）
+  precisionNum: { type: Number, default: 0 } // 默认整数
+});
+
+// Emits定义（统一触发 update:modelValue）
+const emit = defineEmits(["update:modelValue", "change"]);
+
+// 内部状态
+const innerValue = ref(null); // 初始值改为null，适配空值
+const multipleValue = ref([]); // 多选值（仅type=3用）→ 核心：初始化为空数组，杜绝默认0
+const dictOptions = ref([]); // 下拉/字典选项列表
+const dictLoading = ref(false); // 字典加载状态
+
+// ========== 核心：数字框小数位数计算 ==========
+const finalPrecision = computed(() => {
+  if (props.type !== "6") return props.precisionNum;
+
+  // dictData为小数保留位数（优先级最高）
+  if (props.dictData !== "" && props.dictData !== null && props.dictData !== undefined) {
+    const precision = Number(props.dictData);
+    return isNaN(precision) ? 0 : Math.max(0, precision); // 确保非负整数
+  }
+
+  // dictData为空，默认整数（precisionNum=0）
+  return 0;
+});
+
+// ========== 核心修复：值初始化 + 格式适配 → 重点优化多选逻辑 ==========
+watch(() => props.modelValue, (newVal) => {
+  const val = newVal; // 移除兜底空值，保留原始值
+  switch (props.type) {
+      // 开关组件（替代原单选框）：后端1/0 → 前端"1"/"0"
+    case "0":
+      innerValue.value = (val === 1 || val === "1" || val === true) ? "1" : "0";
+      break;
+
+      // 下拉框/字典单选：直接绑定value（zddh）
+    case "1":
+    case "2":
+      innerValue.value = val === null || val === undefined ? "" : String(val);
+      break;
+
+      // 字典多选：核心修复 → 严格过滤空值/无效值，杜绝默认0
+    case "3":
+      // 1. 空值/0/空字符串 → 空数组
+      if (val === null || val === undefined || val === "" || val === 0) {
+        multipleValue.value = [];
+      }
+      // 2. 有效字符串 → 分割为数组（过滤空项）
+      else if (typeof val === "string") {
+        multipleValue.value = val.split(",").filter(item => item.trim() !== "").map(item => String(item));
+      }
+      // 3. 数组类型（特殊场景）→ 直接赋值
+      else if (Array.isArray(val)) {
+        multipleValue.value = val.filter(item => item !== null && item !== undefined && item !== "").map(item => String(item));
+      }
+      // 4. 其他类型 → 空数组
+      else {
+        multipleValue.value = [];
+      }
+      // 移除innerValue同步（避免干扰多选）
+      break;
+
+      // 数字框：空值处理，支持小数位数
+    case "6":
+      // 空值/非数字 → 空（null），否则转为数字
+      if (val === null || val === undefined || val === "" || isNaN(Number(val))) {
+        innerValue.value = null;
+      } else {
+        innerValue.value = Number(val);
+      }
+      break;
+
+      // 日期框：后端 yyyy/mm/dd → 前端 yyyy-MM-dd
+    case "7":
+      innerValue.value = typeof val === "string" && val.includes("/")
+          ? val.replace(/\//g, "-")
+          : val || null;
+      break;
+
+      // 时间框：后端 hh:mm → 前端 hh:mm:ss
+    case "8":
+      innerValue.value = typeof val === "string" && val.includes(":") && val.split(":").length === 2
+          ? `${val}:00`
+          : val || null;
+      break;
+
+      // 其他类型：保留原始值（空值则为null）
+    default:
+      innerValue.value = val === null || val === undefined ? "" : val;
+      break;
+  }
+}, { immediate: true, deep: true });
+
+// ========== 修复：移除innerValue对多选的干扰 → 仅监听非多选类型 ==========
+watch(innerValue, (newVal) => {
+  // 多选类型跳过innerValue监听
+  if (props.type === "3") return;
+
+  let finalVal = newVal;
+
+  // 数字框：空值提交空字符串，非空则保留数字类型
+  if (props.type === "6") {
+    finalVal = newVal === null || newVal === undefined ? "" : Number(newVal);
+  }
+  // 日期框：前端 yyyy-MM-dd → 后端 yyyy/mm/dd
+  else if (props.type === "7" && typeof newVal === "string" && newVal.includes("-")) {
+    finalVal = newVal.replace(/-/g, "/");
+  }
+  // 时间框：前端 hh:mm:ss → 后端 hh:mm
+  else if (props.type === "8" && typeof newVal === "string" && newVal.includes(":")) {
+    finalVal = newVal.split(":").slice(0, 2).join(":");
+  }
+
+  emit("update:modelValue", finalVal);
+  emit("change", finalVal);
+}, { deep: true });
+
+// ========== 字典加载逻辑 → 新增：字典加载后重新同步多选值 ==========
+watch([() => props.type, () => props.dictData], async () => {
+  dictOptions.value = [];
+  // 数字框（type=6）不需要加载字典
+  if (props.type === "1") {
+    await parseJsonDict();
+  } else if (["2", "3"].includes(props.type)) {
+    await loadApiDict();
+    // 字典加载完成后，重新同步多选值（修复选不到值的问题）
+    if (props.type === "3") {
+      const val = props.modelValue;
+      if (val === null || val === undefined || val === "" || val === 0) {
+        multipleValue.value = [];
+      } else if (typeof val === "string") {
+        multipleValue.value = val.split(",").filter(item => item.trim() !== "").map(item => String(item));
+      }
+    }
+  }
+}, { immediate: true, deep: true });
+
+// 解析下拉框JSON数组（type=1）
+async function parseJsonDict() {
+  if (!props.dictData) return;
+  try {
+    let jsonStr = typeof props.dictData === "string" ? props.dictData : JSON.stringify(props.dictData);
+    jsonStr = jsonStr.replace(/\s+/g, " ").replace(/[\n\t]/g, "");
+    let jsonData = JSON.parse(jsonStr);
+    if (!Array.isArray(jsonData)) jsonData = [jsonData];
+    dictOptions.value = jsonData.map(item => ({
+      label: item.label || item.zdmc || item.name || "",
+      value: item.value || item.zddh || item.code || ""
+    })).filter(item => item.label && item.value);
+  } catch (error) {
+    ElMessage.error(`下拉框数据解析失败：${error.message}`);
+    console.error("JSON解析失败：", { raw: props.dictData, error });
+  }
+}
+
+// 加载字典API（type=2/3）：zddh→value，zdmc→label
+async function loadApiDict() {
+  const dictType = props.dictData;
+  if (!dictType) return;
+  if (dictCache.value[dictType]) {
+    dictOptions.value = dictCache.value[dictType];
+    return;
+  }
+  try {
+    dictLoading.value = true;
+    const res = await getoptionselect({ zdlb: dictType });
+    if (res.code === 200 && Array.isArray(res.data)) {
+      dictOptions.value = res.data.map(item => ({
+        label: item.zdmc || item.label || "",
+        value: item.zddh || item.value || ""
+      })).filter(item => item.label && item.value);
+      dictCache.value[dictType] = dictOptions.value;
+    } else {
+      ElMessage.warning(`字典${dictType}无有效数据`);
+    }
+  } catch (error) {
+    ElMessage.error("字典请求失败");
+    console.error("字典API异常：", { dictType, error });
+  } finally {
+    dictLoading.value = false;
+  }
+}
+
+// ========== 开关组件专属变更处理（直接返回数字1/0） ==========
+function handleSwitchChange(val) {
+  // val是字符串1/0，转为数字提交给后端
+  const finalVal = Number(val);
+  emit("update:modelValue", finalVal);
+  emit("change", finalVal);
+}
+
+// ========== 普通值变更处理（除开关/多选外） ==========
+function handleValueChange(val) {
+  let finalVal = val;
+  emit("update:modelValue", finalVal);
+  emit("change", finalVal);
+}
+
+// ========== 核心修复：多选值变更处理 → 简化逻辑，杜绝值覆盖 ==========
+function handleMultipleChange(val) {
+  // 1. 过滤空值，避免提交无效数据
+  const validVal = val.filter(item => item !== null && item !== undefined && item !== "");
+  // 2. 转为逗号分隔字符串（后端格式）
+  const strVal = validVal.join(",");
+  // 3. 更新多选值（确保同步）
+  multipleValue.value = validVal;
+  // 4. 触发父组件更新
+  emit("update:modelValue", strVal);
+  emit("change", strVal);
+}
+
+// ========== 初始化优化 → 移除多选冗余逻辑，杜绝默认0 ==========
+onMounted(() => {
+  // 开关组件初始值兜底
+  if (props.type === "0" && innerValue.value === null) {
+    innerValue.value = "0"; // 默认关闭
+    emit("update:modelValue", 0); // 后端默认值：0
+  }
+  // 多选初始化：仅处理有效值，杜绝空值/0转为["0"]
+  if (props.type === "3") {
+    const val = props.modelValue;
+    if (val === null || val === undefined || val === "" || val === 0) {
+      multipleValue.value = [];
+    } else if (typeof val === "string") {
+      multipleValue.value = val.split(",").filter(item => item.trim() !== "").map(item => String(item));
+    }
+  }
+});
+</script>
+
+<style scoped>
+.dynamic-input-container {
+  width: 100%;
+  height: 100%; /* 关键：占满表格单元格高度 */
+  display: flex;
+  align-items: center; /* 垂直居中 */
+  justify-content: center; /* 水平居中 */
+  padding: 0 2px; /* 轻微内边距，避免贴边 */
+}
+
+/* 开关组件样式优化 */
+:deep(.el-switch) {
+  margin: 0 auto; /* 开关水平居中 */
+}
+
+/* 深度选择器强制覆盖激活颜色 */
+:deep(.custom-switch .el-switch__core) {
+  /* 开启状态背景色 */
+  --el-switch-on-color: #13ce66 !important;
+  /* 关闭状态背景色（可选） */
+  --el-switch-off-color: #C3C3C3 !important;
+}
+
+/* 兼容旧版Element Plus（可选） */
+:deep(.custom-switch .el-switch__core.is-checked) {
+  background-color: #13ce66 !important;
+  border-color: #13ce66 !important;
+}
+
+:deep(.el-radio-group) {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+}
+
+:deep(.el-select--small),
+:deep(.el-input--small),
+:deep(.el-input-number--small),
+:deep(.el-date-picker--small),
+:deep(.el-time-picker--small) {
+  width: 100%;
+}
+
+/* 数字输入框空值样式优化 */
+:deep(.el-input-number--small) {
+  .el-input__inner {
+    text-align: center;
+  }
+
+  /* 空值时占位符样式 */
+  .el-input__placeholder {
+    color: #999;
+    font-size: 12px;
+  }
+}
+
+/* 多选下拉样式优化：避免高度溢出 */
+:deep(.el-select--multiple .el-select__tags) {
+  flex-wrap: wrap;
+  min-height: 32px; /* 匹配small尺寸高度 */
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/configdict/index.vue b/src/views/liswork/xtwh/configdict/index.vue
new file mode 100644
index 0000000..9692782
--- /dev/null
+++ b/src/views/liswork/xtwh/configdict/index.vue
@@ -0,0 +1,365 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item :label="menuname + '类别'" prop="configType">
+        <el-select v-model="queryParams.configType" :placeholder="`请选择${menuname}类别`" clearable style="width: 200px"
+          @change="handleQuery">
+          <el-option v-for="item in configTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="menuname + '编码'" prop="configCode">
+        <el-input v-model="queryParams.configCode" :placeholder="`请输入${menuname}编码`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="`${menuname}名称`" prop="configName">
+        <el-input v-model="queryParams.configName" :placeholder="`请输入${menuname}名称`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <div class="table-container">
+      <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange" class="config-table"
+        height="100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column :label="`${menuname}编号`" align="center" prop="configId" v-if="false" />
+        <el-table-column :label="`${menuname}类别`" align="center" prop="configType" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <span class="config-type-cell" :style="{
+              backgroundColor: getConfigTypeColor(scope.row.configType),
+              color: '#fff' // 文字白色，保证对比
+            }">
+              {{configTypeOptions.find(item => item.value === scope.row.configType)?.label || scope.row.configType}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="`${menuname}编码`" align="center" prop="configCode" width="150" show-overflow-tooltip />
+        <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip />
+        <el-table-column label="选项类型" align="center" prop="configOptiontype" width="100">
+          <template #default="scope">
+            <span class="config-type-cell" :style="{
+              backgroundColor: getconfigOptionTypeColor(scope.row.configOptiontype),
+              color: '#fff' // 文字白色，保证对比
+            }">
+              {{configOptiontypeOptions.find(item => item.value === scope.row.configOptiontype)?.label ||
+                scope.row.configOptiontype}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="默认值" align="center" prop="configDefvalue" width="200" show-overflow-tooltip>
+          <template #default="scope">
+            <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+              :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+          </template>
+        </el-table-column>
+        <el-table-column label="值域规则" align="left" prop="remark" show-overflow-tooltip />
+        <el-table-column label="排序" align="center" prop="configSort" width="80" />
+        <el-table-column label="状态" align="center" prop="status" width="80">
+          <template #default="scope">
+            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <!-- 添加或修改字典对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px">
+      <el-form ref="configdictRef" :model="form" :rules="rules" label-width="150px">
+        <el-form-item :label="`${menuname}类别`" prop="configType">
+          <el-select v-model="form.configType" :placeholder="`请选择${menuname}类别`" style="width: 100%">
+            <el-option v-for="item in configTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}编码`" prop="configCode">
+          <el-input v-model="form.configCode" :placeholder="`请输入${menuname}编码`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}名称`" prop="configName">
+          <el-input v-model="form.configName" :placeholder="`请输入${menuname}名称`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}选项类型`" prop="configOptiontype">
+          <el-select v-model="form.configOptiontype" :placeholder="`请选择${menuname}选项类型`" style="width: 100%">
+            <el-option v-for="item in configOptiontypeOptions" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}默认值`" prop="configDefvalue">
+          <el-input v-model="form.configDefvalue" :placeholder="`请输入${menuname}默认值`" />
+        </el-form-item>
+
+        <el-form-item label="顺序" prop="configSort">
+          <el-input-number v-model="form.configSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="值域参数JSON" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="configdict">
+import { listData, } from "@/api/system/dict/data";
+import {
+  addconfigdict, delconfigdict,
+  getconfigdict,
+  listconfigdict,
+  updateconfigdict
+} from "@/api/liswork/xtwh/configdictApi.ts";
+import DynamicInput from "../components/DynamicInput.vue"
+// 1. 定义类别下拉选项（根据实际业务调整）
+
+// 2. 定义获取类别对应颜色的方法
+function getConfigTypeColor(type) {
+  // 匹配对应类别的颜色，无匹配时用默认色
+  const item = configTypeOptions.value.find(item => item.value === type);
+  return item?.elTagClass || "#909399"; // 默认灰色
+}
+// 2. 定义参数类别下拉选项（根据实际业务调整）
+const configOptiontypeOptions = ref([
+  { label: "单选框", value: "0", color: "#56BBBD" },
+  { label: "下拉框", value: "1", color: "#67C23A" },
+  { label: "字典单选", value: "2", color: "#FF443F" },
+  { label: "字典多选", value: "3", color: "#F08784" },
+  { label: "特殊", value: "4", color: "#909399" },
+  { label: "文本框", value: "5", color: "#3282F6" },
+  { label: "数字框", value: "6", color: "#507F80" },
+  { label: "日期框", value: "7", color: "#7E84F7" },
+  { label: "时间框", value: "8", color: "#377D22" },
+]);
+function getconfigOptionTypeColor(type) {
+  // 匹配对应类别的颜色，无匹配时用默认色
+  const item = configOptiontypeOptions.value.find(item => item.value === type);
+  return item?.color || "#909399"; // 默认灰色
+}
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { lis_opt_type } = proxy.useDict("lis_opt_type"); //参数类别
+
+const configTypeOptions = lis_opt_type
+const regdictList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const menuname = ref("参数");
+const data = reactive({
+  form: {},
+  queryParams: {
+    configCode: undefined,
+    configName: undefined,
+    configType: undefined,
+    status: undefined,
+    pageNum: 1,
+    pageSize: 30
+  },
+  rules: {
+    configType: [{ required: true, message: menuname.value + "类别不能为空", trigger: "blur" }],
+    configName: [{ required: true, message: menuname.value + "名称不能为空", trigger: "blur" }],
+    configCode: [{ required: true, message: menuname.value + "编码不能为空", trigger: "blur" }],
+    configSort: [{ required: true, message: menuname.value + "顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+/** 查询字典列表 */
+function getList() {
+  loading.value = true;
+  listconfigdict(queryParams.value).then(response => {
+    regdictList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    configId: undefined,
+    configCode: undefined,
+    configName: undefined,
+    configType: configTypeOptions.value[0]?.value || "",
+    configOptiontype: configOptiontypeOptions.value[0]?.value || "",
+    configDefvalue: undefined,
+    configSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("configdictRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.configId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加" + menuname.value;
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const configId = row.configId || ids.value;
+  getconfigdict(configId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改" + menuname.value;
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["configdictRef"].validate(valid => {
+    if (valid) {
+      if (form.value.configId != undefined) {
+        updateconfigdict(form.value).then(response => {
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess("修改成功");
+            open.value = false;
+            getList();
+          }
+        });
+      } else {
+        addconfigdict(form.value).then(response => {
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess("新增成功");
+            open.value = false;
+            getList();
+          }
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const configIds = row.configId || ids.value;
+  proxy.$modal.confirm('是否确认删除"' + menuname.value + '"编号为"' + configIds + '"的数据项？').then(function () {
+    return delconfigdict(configIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("delconfigdict/export", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
+getList();
+</script>
+<style scoped>
+.mb8 {
+  height: 30px;
+  /* 固定高度 */
+}
+
+.table-container {
+  height: calc(100% - 150px);
+}
+
+/* 1. 减小表格行高（核心） */
+:deep(.config-table .el-table__row) {
+  height: 30px !important;
+  /* 原默认行高约40px，按需调整（建议28-35px） */
+  line-height: 30px !important;
+  /* 行高与height一致，保证垂直居中 */
+}
+
+/* 2. 减小单元格内边距（配合行高优化） */
+:deep(.config-table .el-table__cell) {
+  padding: 2px 4px !important;
+  height: 30px !important;
+  /* 单元格高度与行高一致 */
+  line-height: 1.2 !important;
+  /* 文字行高适配矮行 */
+  vertical-align: middle !important;
+  /* 强制垂直居中 */
+}
+
+/* 3. 类别单元格适配矮行高 */
+.config-type-cell {
+  width: 100%;
+  height: 100%;
+  min-height: 26px;
+  /* 适配30px行高，略小一点 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  font-size: 12px;
+}
+
+/* 可选：优化操作列按钮大小，适配矮行 */
+:deep(.config-table .el-button--link) {
+  padding: 0 4px !important;
+  font-size: 12px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/localconfig/index.vue b/src/views/liswork/xtwh/localconfig/index.vue
new file mode 100644
index 0000000..bcad496
--- /dev/null
+++ b/src/views/liswork/xtwh/localconfig/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="app-container">
+
+
+    <!-- 操作按钮栏：改为保存/取消/还原默认 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleSave">保存</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Download" @click="handleRestoreDefault">还原默认</el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="5" class="table-container">
+      <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange" class="config-table"
+        height="100%">
+        <el-table-column label="序号" align="center" prop="configSort" />
+        <el-table-column :label="`${menuname}编码`" align="center" prop="configCode" show-overflow-tooltip />
+        <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip />
+        <!-- 核心：默认值列改为持久化可编辑输入框 -->
+        <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip>
+          <template #default="scope">
+            <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+              :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" />
+          </template>
+        </el-table-column>
+        <el-table-column label="值码" align="center" prop="configDefvalue" show-overflow-tooltip />
+      </el-table>
+    </el-row>
+  </div>
+</template>
+
+<script setup name="localconfig">
+// 导入核心依赖
+import { ref, reactive, toRefs, getCurrentInstance } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import DynamicInput from "../components/DynamicInput.vue";
+import { listlocalconfig, savelocalconfig, getLocalConfigDefault } from "@/api/liswork/xtwh/localconfigApi.ts";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+// 表格数据（原始数据缓存，用于取消修改）
+const regdictList = ref([]);
+const originRegdictList = ref([]); // 缓存原始数据，用于取消修改
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const menuname = ref("本地选项");
+
+const data = reactive({
+  queryParams: {
+    configCode: undefined,
+    configName: undefined,
+    configType: undefined,
+    status: undefined
+  }
+});
+
+
+const { queryParams } = toRefs(data);
+
+/** 查询字典列表（缓存原始数据） */
+function getList() {
+  loading.value = true;
+  listlocalconfig(queryParams.value).then(response => {
+    // 存储表格展示数据
+    regdictList.value = response.data.map(item => ({ ...item }));
+    // 缓存原始数据（深拷贝，避免引用修改）
+    originRegdictList.value = JSON.parse(JSON.stringify(response.data));
+    total.value = response.data.length;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 表格行选中事件 */
+function handleSelectionChange(val) {
+  ids.value = val.map(item => item.configId);
+  single.value = val.length === 1;
+  multiple.value = val.length > 1;
+}
+
+/** 核心：保存整个表格数据（批量提交） */
+async function handleSave() {
+  // 空值校验：检查所有行的默认值是否为空
+  //const emptyRows = regdictList.value.filter(item => !item.configDefvalue?.trim());
+  //if (emptyRows.length > 0) {
+  //  ElMessage.warning(`有${emptyRows.length}行默认值为空，请补充后再保存！`);
+  //   return;
+  // }
+
+  try {
+    loading.value = true;
+    // 调用批量保存接口，传入整个列表
+    const res = await savelocalconfig(regdictList.value);
+    if (res.code === 200) {
+      ElMessage.success("批量保存成功！");
+      // 保存后更新原始数据缓存
+      originRegdictList.value = JSON.parse(JSON.stringify(regdictList.value));
+    } else {
+      ElMessage.error(res.msg || "批量保存失败，请重试！");
+    }
+  } catch (error) {
+    ElMessage.error("保存失败，网络异常！");
+    console.error("保存失败：", error);
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 取消修改：恢复原始数据 */
+function handleCancelEdit() {
+  ElMessageBox.confirm(
+    "是否确认取消所有修改，恢复到原始数据？",
+    "提示",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    }
+  ).then(() => {
+    // 恢复原始数据
+    regdictList.value = JSON.parse(JSON.stringify(originRegdictList.value));
+    ElMessage.success("已取消所有修改，恢复原始数据！");
+  });
+}
+
+/** 还原默认值：调用接口获取默认值并刷新 */
+async function handleRestoreDefault() {
+  ElMessageBox.confirm(
+    "是否确认还原所有默认值？此操作会覆盖当前修改！",
+    "警告",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "danger"
+    }
+  ).then(async () => {
+    try {
+      loading.value = true;
+      // 调用还原默认接口
+      const res = await getLocalConfigDefault(queryParams.value);
+      if (res.code === 200) {
+        // 更新表格数据和原始缓存
+        regdictList.value = res.data.map(item => ({ ...item }));
+        originRegdictList.value = JSON.parse(JSON.stringify(res.data));
+        ElMessage.success("已成功还原默认值！");
+      } else {
+        ElMessage.error(res.msg || "还原默认值失败，请重试！");
+      }
+    } catch (error) {
+      ElMessage.error("还原失败，网络异常！");
+      console.error("还原默认值失败：", error);
+    } finally {
+      loading.value = false;
+    }
+  });
+}
+
+// 初始化加载数据
+getList();
+</script>
+
+<style scoped>
+.app-container {
+  display: flex;
+  flex-direction: column;
+  height: 90vh;
+  overflow: hidden;
+}
+
+.mb8 {
+  height: 30px;
+  margin-bottom: 8px;
+}
+
+.table-container {
+  width: 100%;
+  flex: 1;
+  overflow: hidden;
+}
+
+/* 表格样式优化 */
+:deep(.config-table .el-table__row) {
+  height: 30px !important;
+  line-height: 30px !important;
+}
+
+:deep(.config-table .el-table__cell) {
+  padding: 2px 4px !important;
+  height: 30px !important;
+  line-height: 1.2 !important;
+  vertical-align: middle !important;
+}
+
+/* 编辑输入框样式适配 */
+:deep(.config-table .edit-input) {
+  width: 100%;
+}
+
+:deep(.config-table .edit-input .el-input__inner) {
+  padding: 0 5px;
+  height: 24px;
+  line-height: 24px;
+  font-size: 12px;
+  border: 1px solid #dcdfe6;
+}
+
+:deep(.config-table .edit-input .el-input__inner:focus) {
+  border-color: #409eff;
+  outline: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/bbcx/index.vue b/src/views/regional/circulation/bbcx/index.vue
new file mode 100644
index 0000000..ba30d9b
--- /dev/null
+++ b/src/views/regional/circulation/bbcx/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="标本状态：" prop="Status">
+              <el-select v-model="queryParams.Status" placeholder="请选择" clearable>
+                <el-option v-for="item in regdictList" :label="item.dictName" :value="item.dictCode" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="采样人：" prop="AffirmUserName">
+              <el-input v-model="queryParams.AffirmUserName" placeholder="请输入采样人" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="签收人：" prop="SignInUserName">
+              <el-input v-model="queryParams.SignInUserName" placeholder="请输入签收人" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div>
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange" @row-click="rowHandle">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
+    <!-- 样本流程 -->
+    <div class="time-line-box">
+      <div v-for="(item, i) in timelineItems" :key="i" class="time-line-item">
+        <div v-if="i != 0" class="timeline-connector">
+          <img class="timg" src="@/assets/images/yjt.png" alt="">
+        </div>
+        <div :class="['timeline-content', i > lastTimeIndex ? 'no_active' : '']">
+          <div :class="['index', lastTimeIndex == i ? 'active' : '']">{{ i + 1 }}
+          </div>
+          <div class="timeline-title">{{ item.title }}</div>
+          <div class="timeline-time">{{ item.time }}</div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { querySample } from '@/api/regional/index'
+import SelectTable from '@/components/SelectTable/index.vue';
+import { classCom } from '@/utils/classCom';
+const aotuSize = classCom.useAutoSize();
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1,
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, width: 150 },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 200 },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 70 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 200 },
+  { prop: 'sampleTypeName', label: '标本类型', align: 'center', visible: true, },
+  { prop: 'tubeName', label: '采集容器', align: 'center', visible: true, },
+  { prop: 'status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  // { prop: 'moveStateName', label: '流转状态', align: 'center', visible: true, },
+  { prop: 'affirmUserName', label: '采样人', align: 'center', visible: true, },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'signInUserName', label: '签收人', align: 'center', visible: true, },
+  { prop: 'signInTime', label: '签收时间', align: 'center', visible: true, width: 150 },
+  { prop: 'dstHospName', label: '检测机构名称', align: 'center', visible: true, width: 150 },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '65vh', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  // fit: true, // 列宽自适应
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+
+// 时间线数据
+const timelineItems = ref(
+  [
+    { title: '检验申请', time: '' },
+    { title: '标本采集', time: '' },
+    { title: '标本送检', time: '' },
+    { title: '标本外送', time: '' },
+    { title: '标本签收', time: '' },
+    { title: '上机检测', time: '' },
+    { title: '结果审核', time: '' },
+    { title: '报告发布', time: '' },
+  ]
+);
+
+// 计算最后一个有时间的节点索引
+const lastTimeIndex = computed(() => {
+
+  const lastIndex = timelineItems.value.findLastIndex(item => item.time);
+  if (lastIndex === -1) {
+    return -1
+  } else {
+    return lastIndex;
+  }
+});
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+
+
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+  }
+  handleQuery()
+}
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+const rowHandle = (row: any) => {
+  timelineItems.value =
+    [
+      { title: '检验申请', time: row.orderTime },
+      { title: '标本采集', time: row.affirmTime },
+      { title: '标本送检', time: row.signInDate },
+      { title: '标本外送', time: row.sendPackTime },
+      { title: '标本签收', time: row.signInTime },
+      { title: '上机检测', time: row.testDate },
+      { title: '结果审核', time: row.auditTime },
+      { title: '报告发布', time: row.reportTime },
+    ]
+}
+
+const tableRefs = ref()
+const getList = () => {
+  querySample(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+    tableRefs.value.setCurrentRow(res.rows[0])
+    rowHandle(res.rows[0])
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  getList()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/bbqs/index.vue b/src/views/regional/circulation/bbqs/index.vue
new file mode 100644
index 0000000..23eeb61
--- /dev/null
+++ b/src/views/regional/circulation/bbqs/index.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="mb10">
+      <el-button type="primary" @click="qsHandle(50)">标本签收</el-button>
+      <el-button type="primary" @click="qsHandle(110)">标本拒签</el-button>
+      <el-button type="primary" plain @click="bbThHandle">标本退回</el-button>
+    </div>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { querySampleSign, sampleSign } from '@/api/regional/index'
+import SelectTable from '@/components/SelectTable/index.vue';
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import { classCom } from '@/utils/classCom';
+import { ElMessage, ElMessageBox } from 'element-plus';
+const aotuSize = classCom.useAutoSize();
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { type: 'selection', align: 'center', visible: true, width: 40 },
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, width: 150 },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 250 },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 70 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 250 },
+  { prop: 'sampleTypeName', label: '标本类型', align: 'center', visible: true, },
+  { prop: 'tubeName', label: '采集容器', align: 'center', visible: true, },
+  { prop: 'status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  // { prop: 'moveStateName', label: '流转状态', align: 'center', visible: true, },
+  { prop: 'affirmUserName', label: '采样人', align: 'center', visible: true, },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'dstHospName', label: '检测机构名称', align: 'center', visible: true, width: 150 },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  // fit: true, // 列宽自适应
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+const barcodes = ref([])
+const tableRefs = ref(null)
+const handleSelectionChange = (val: any) => {
+  barcodes.value = val.map((item: any) => item.barcode)
+}
+const backReasons = ref('')
+const bbThHandle = () => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  ElMessageBox.prompt('请输入退回理由：', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    inputPattern: /\S+/,
+    inputErrorMessage: '请输入退回理由',
+  })
+    .then(({ value }) => {
+      backReasons.value = value
+      qsHandle(100)
+    }).catch(() => {
+      backReasons.value = ''
+    });
+}
+//标本签收
+const qsHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  sampleSign({ status: val, barcode: barcodes.value, backReasons: backReasons.value }).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      backReasons.value = ''
+      handleQuery()
+    }
+  })
+}
+
+const goThPage = () => {
+  router.push('/regional/circulation/bbth')
+}
+
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+  }
+  handleQuery()
+}
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  console.log('page==>', page);
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+
+const getList = () => {
+  querySampleSign(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  getList()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+
+.btns {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  &>button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/bbth/index.vue b/src/views/regional/circulation/bbth/index.vue
new file mode 100644
index 0000000..7de86a5
--- /dev/null
+++ b/src/views/regional/circulation/bbth/index.vue
@@ -0,0 +1,223 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="mb10">
+      <el-button type="primary" @click="thHandle(20)">重新采集</el-button>
+      <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
+      <el-button type="primary" @click="thHandle(90)">申请作废</el-button>
+
+    </div>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { querySampleSignBack, sampleSign } from '@/api/regional/index'
+import SelectTable from '@/components/SelectTable/index.vue';
+import { classCom } from '@/utils/classCom';
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import { ElMessage } from 'element-plus';
+const aotuSize = classCom.useAutoSize();
+
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1,
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { type: 'selection', align: 'center', visible: true, width: 40 },
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 60 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '检测机构', align: 'center', visible: true, width: 200 },
+  { prop: 'Status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  { prop: 'backReasons', label: '退回理由', align: 'center', visible: true, width: 150 },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'backUserName', label: '操作人', align: 'center', visible: true, },
+  { prop: 'backTime', label: '操作时间', align: 'center', visible: true, width: 150 },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  // fit: true, // 列宽自适应
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+const barcodes = ref([])
+const tableRefs = ref(null)
+
+const thHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  sampleSign({ status: val, barcode: barcodes.value }).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      handleQuery()
+    }
+  })
+}
+const handleSelectionChange = (val: any) => {
+  barcodes.value = val.map((item: any) => item.barcode)
+}
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+  }
+  handleQuery()
+}
+const getList = () => {
+  querySampleSignBack(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  getList()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+
+.btns {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  &>button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/components/OutPatList.vue b/src/views/regional/circulation/components/OutPatList.vue
new file mode 100644
index 0000000..efcf28d
--- /dev/null
+++ b/src/views/regional/circulation/components/OutPatList.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <el-button @click="handleClick">查询病人</el-button>
+
+    <!-- 病人选择弹窗 -->
+    <el-dialog v-model="dialogVisible" :title="props.dialogTitle" width="500px" @close="handleDialogClose">
+      <el-input v-model="searchKey" placeholder="搜索（支持姓名、病人ID、简拼）..." class="mb-4" clearable @clear="filteredPatData"
+        @input="filteredPatData" @keyup.down="navigateTable('down')" @keyup.up="navigateTable('up')"
+        @keyup.enter="selectActiveItem" />
+
+      <el-table :data="filteredPatData" height="300px" border @row-click="selectItem" @row-dblclick="selectItem"
+        class="compact-form my-table">
+        <template #empty>
+          <div v-if="isPatLoading">加载中...</div>
+          <div v-else>没有匹配的病人数据</div>
+        </template>
+
+        <el-table-column prop="pid" label="病人ID" width="100" show-overflow-tooltip />
+        <el-table-column prop="name" label="姓名" width="100" show-overflow-tooltip />
+        <el-table-column prop="xb" label="性别" width="80" show-overflow-tooltip />
+        <el-table-column prop="nl" label="年龄" width="80" show-overflow-tooltip />
+        <el-table-column prop="ks" label="科室" width="100" show-overflow-tooltip />
+        <el-table-column prop="ch" label="床号" width="80" show-overflow-tooltip />
+        <el-table-column prop="pinyin" label="简拼" width="150" show-overflow-tooltip />
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, watch, onMounted } from 'vue';
+import { queryPatList } from "@/api/mzcx/cydj.ts";
+import { getFirstLetter } from '@/utils/pinyin'; // 引入拼音处理工具
+// 组件参数
+const props = defineProps({
+  pidValue: { type: [String, Number], default: '' },
+  PatType: { type: String },
+  placeholder: { type: String, default: '请输入或双击选择' },
+  clearable: { type: Boolean, default: true },
+  disabled: { type: Boolean, default: false },
+  dialogTitle: { type: String, default: '选择病人' }
+});
+
+// 组件事件
+const emit = defineEmits(['update:pidValue', 'select']);
+
+// 内部状态
+const dialogVisible = ref(false);
+const searchKey = ref('');
+const PatData = ref([]); // 存储带简拼的病人数据
+const isPatLoading = ref(true);
+const activeRowIndex = ref(-1); // 键盘导航选中行索引
+
+
+// 加载病人数据
+const loadPatData = async () => {
+  isPatLoading.value = true;
+  queryPatList().then(response => {
+    //  console.log('response:', response.data);
+    PatData.value = (response.data || []).map(item => ({
+      ...item,
+      pinyin: getFirstLetter(item.name)
+    }));
+  }).catch(() => {
+    console.error(`加载病人列表失败:`, error);
+    PatData.value = [];
+  }).finally(() => {
+    isPatLoading.value = false;
+  });
+};
+
+// 过滤病人数据（使用 computed 提高性能）
+const filteredPatData = computed(() => {
+  const key = searchKey.value.trim().toLowerCase();
+  if (!key) return PatData.value;
+
+  return PatData.value.filter(item => {
+    const matchName = item.name.toLowerCase().includes(key);
+    const matchPid = String(item.pid).toLowerCase().includes(key);
+    const matchPinyin = item.pinyin.toLowerCase().includes(key);
+
+    return matchName || matchPid || matchPinyin;
+  });
+});
+
+// 点击按钮事件处理
+const handleClick = () => {
+  loadPatData();
+  // if (!props.disabled && !isPatLoading.value) {
+  dialogVisible.value = true;
+  searchKey.value = '';
+  activeRowIndex.value = -1;
+  // }
+};
+
+// 选择病人项
+const selectItem = (item) => {
+  emit('update:pidValue', item.pid);
+  emit('select', item.pid);
+  dialogVisible.value = false;
+};
+
+// 键盘导航
+const navigateTable = (direction) => {
+  if (!filteredPatData.value.length) return;
+
+  if (direction === 'down') {
+    activeRowIndex.value = (activeRowIndex.value + 1) % filteredPatData.value.length;
+  } else if (direction === 'up') {
+    activeRowIndex.value = (activeRowIndex.value - 1 + filteredPatData.value.length) % filteredPatData.value.length;
+  }
+};
+
+// 选择当前活动行
+const selectActiveItem = () => {
+  if (activeRowIndex.value >= 0 && activeRowIndex.value < filteredPatData.value.length) {
+    selectItem(filteredPatData.value[activeRowIndex.value]);
+  }
+};
+
+// 关闭弹窗
+const handleDialogClose = () => {
+  dialogVisible.value = false;
+  activeRowIndex.value = -1;
+};
+
+
+</script>
+
+<style scoped>
+/* 可选：添加活动行样式 */
+:deep(.el-table__row.active) {
+  background-color: #e6f7ff !important;
+}
+
+::v-deep .my-table .el-table__row td {
+  padding: 1px 0;
+  /* 减小行高 */
+}
+
+::v-deep .my-table .el-table__header-wrapper th {
+  padding: 6px 0;
+  /* 表头内边距 */
+  background-color: #b3d8ff !important;
+  /* 表头背景色（保留之前的设置） */
+  color: #333;
+  /* 文字颜色加深，提升可读性 */
+  font-weight: 500;
+  /* 文字加粗 */
+}
+
+::v-deep .my-table .el-table__cell {
+  padding: 0 2px;
+  /* 减小列间距 */
+}
+
+/* 可选：调整表格整体样式 */
+::v-deep .my-table {
+  font-size: 13px;
+  /* 适当减小字体 */
+}
+
+::v-deep .my-table .el-table__cell,
+::v-deep .my-table .el-table__header-wrapper th {
+  border-width: 1px;
+  border-color: #ebeef5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/mzcy/index.vue b/src/views/regional/circulation/mzcy/index.vue
new file mode 100644
index 0000000..6ceb7e8
--- /dev/null
+++ b/src/views/regional/circulation/mzcy/index.vue
@@ -0,0 +1,543 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left">
+      <el-row :gutter="5">
+        <el-form-item label="" label-width="0px" prop="brdh">
+          <el-col :span="6">
+            <div> 就诊卡号/病历号/磁卡号: </div>
+            <el-input v-model="queryParams.brdh" placeholder="就诊卡号/病历号/磁卡号" clearable @keyup.enter="handleQuery" />
+          </el-col>
+          <el-col :span="2">
+            <el-radio-group v-model="queryParams.zt" size="default">
+              <el-radio v-for="(item, index) in showconfirmOptions" :key="index" :value="item.value"
+                :disabled="item.disabled">{{ item.label }}</el-radio>
+            </el-radio-group>
+          </el-col>
+          <el-col :span="1">
+            <div> 申请获取期限: </div>
+          </el-col>
+          <el-col :span="6">
+
+            <el-radio-group v-model="queryParams.subday" size="default">
+              <el-radio v-for="(item, index) in subdayOptions" :key="index" :value="item.value"
+                :disabled="item.disabled">{{ item.label }}</el-radio>
+            </el-radio-group>
+          </el-col>
+          <el-col :span="3">
+            <el-select v-model="queryParams.cardtype" placeholder="卡类型" clearable :style="{ width: '100%' }">
+              <el-option v-for="(item, index) in cardtypeOptions" :key="index" :label="item.label" :value="item.value"
+                :disabled="item.disabled"></el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" icon="Search" @click="readCard">读卡</el-button>
+          </el-col>
+          <el-col :span="2">
+            <PatSearchDialog @select="handlePatientSelect" />
+          </el-col>
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <el-row :gutter="5" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Printer" :disabled="single" @click="printAll">打印</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Printer" :disabled="single" @click="printSigne">单打条码</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Printer" :disabled="freesingle" @click="printBack">单打回单</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Delete" @click="cancel">取消采样</el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="5" class="table-container">
+      <el-table ref="tableRef" :data="reqmainList" @selection-change="handleSelectionChange" @select="handleSelect"
+        height="100%" :cell-style="tableCellStyle">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="项目名称" align="center" prop="sqxmmc" width="200" show-overflow-tooltip />
+        <el-table-column label="项目代码" align="center" prop="sqxmdh" width="100" show-overflow-tooltip />
+        <el-table-column label="项目类别" align="center" prop="cp_xmlb" />
+        <el-table-column label="样本类型" align="center" prop="yblx" />
+        <el-table-column label="条码号" align="center" prop="sqh" width="150" show-overflow-tooltip />
+        <el-table-column label="申请时间" align="center" prop="sqsj" width="180" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.sqsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="病人姓名" align="center" prop="brxm" show-overflow-tooltip />
+        <el-table-column label="申请医生" align="center" prop="sqys" :formatter="formatDict('SRD')" show-overflow-tooltip />
+        <el-table-column label="序号" align="center" prop="xh" show-overflow-tooltip />
+        <el-table-column label="数量" align="center" prop="sl" show-overflow-tooltip />
+        <el-table-column label="单价" align="center" prop="dj" show-overflow-tooltip />
+        <el-table-column label="状态" align="center" prop="zt" show-overflow-tooltip />
+        <el-table-column label="计价" align="center" prop="jjzt">
+          <template #default="scope">
+            <el-checkbox :model-value="scope.row.jjzt === '1'" disabled>
+            </el-checkbox>
+          </template>
+        </el-table-column>
+        <el-table-column label="病人代号" align="center" prop="brdh" show-overflow-tooltip />
+        <el-table-column label="备注1" align="center" prop="detailBZ1" show-overflow-tooltip />
+        <el-table-column label="备注2" align="center" prop="detailBZ2" show-overflow-tooltip />
+        <el-table-column label="颜色" align="center" prop="cp_color" v-if="false" show-overflow-tooltip />
+        <el-table-column label="确认标识" align="center" prop="cp_cflag" v-if="false" show-overflow-tooltip />
+        <el-table-column label="科室" align="center" prop="ksdh" :formatter="formatDict('DP')" show-overflow-tooltip />
+        <el-table-column label="病人类型" align="center" prop="brly" :formatter="formatDict('PT')" show-overflow-tooltip />
+        <el-table-column label="性别" align="center" prop="brxb" :formatter="formatDict('SX')" show-overflow-tooltip />
+        <el-table-column label="生日" align="center" prop="brsr" width="180" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.brsr, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="床号" align="center" prop="ch" width="50" show-overflow-tooltip />
+        <el-table-column label="诊断" align="center" prop="zd" width="150" show-overflow-tooltip />
+        <el-table-column label="条码类别" align="center" prop="bgddh" v-if="false" show-overflow-tooltip />
+        <el-table-column label="年龄" align="center" prop="nl" show-overflow-tooltip />
+        <el-table-column label="年龄单位" align="center" prop="nldw" :formatter="formatDict('AU')" show-overflow-tooltip />
+        <el-table-column label="采样时间" align="center" prop="cysj" width="180" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.cysj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+    <!-- 汇总行 -->
+    <div class="table-summary">
+      <div class="summary-item">
+        <span class="summary-label">条码数：</span>
+        <span class="summary-value">{{ idsnew.length }}</span>
+      </div>
+      <div class="summary-item">
+        <span class="summary-label">项目数：</span>
+        <span class="summary-value">{{ totalRows }}</span>
+      </div>
+      <div class="summary-item">
+        <span class="summary-label">合计金额：</span>
+        <span class="summary-value">{{ totalPrice.toFixed(2) }}</span>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script setup>
+import {
+  querySQD,
+  queryPatList,
+  printBackpaper,
+  printBarcodeall
+} from "@/api/mzcx/cydj.js";
+import { querySample } from '@/api/regional/index'
+import PatSearchDialog from '../components/OutPatList.vue'
+// import PatSearchDialog from './components/OutPatList.vue'
+import { classCom } from '@/utils/classCom';
+const comDict = inject('comDict');
+// 字典数据存储
+const dictData = ref({});
+const tableRef = ref(null);
+const { proxy } = getCurrentInstance();
+// 选中的行
+const selectedRows = ref([]);
+const reqmainList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+// 新增：计算属性，返回去重后的ids数组
+const idsnew = computed(() => {
+  return [...new Set(ids.value)];
+});
+const single = ref(true);
+const freesingle = ref(true);
+const cardtypeOptions = ref([{ "label": "就诊卡", "value": 1 }, { "label": "医保卡", "value": 2 }, { "label": "电子医保卡", "value": 3 }, { "label": "身份证", "value": 4 }])
+const showconfirmOptions = ref([{ "label": "未打印", "value": 1 }, { "label": "已打印", "value": 11 }])
+const subdayOptions = ref([{ "label": "1天", "value": 1 }, { "label": "3天", "value": 3 }, { "label": "1周", "value": 7 }, { "label": "2周", "value": 14 }, { "label": "1月", "value": 30 }, { "label": "3月", "value": 90 }, { "label": "1年", "value": 365 }, { "label": "2年", "value": 730 }])
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    brdh: null,
+    stime: null,
+    etime: null,
+    klx: null,
+    zt: 1,
+    subday: 3000,
+    cardtype: null,
+    Status: '10'
+  },
+  rules: {
+    brdh: [
+      { required: true, message: "病人代码不能为空", trigger: "blur" }
+    ],
+    subday: [],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+// 标志位：是否是程序自动勾选（避免循环触发事件）
+const isAutoSelect = ref(false);
+
+/**
+ * 监听单选勾选/取消事件
+ * @param {Array} selection 目前已选中的行
+ * @param {Object} row 当前操作的行数据
+ * @param {Boolean} selected 是否勾选（true=勾选，false=取消）
+ */
+const handleSelect = (selection, row, selected) => {
+  if (isAutoSelect.value) return;
+
+  const targetSqh = row.sqh;
+  const targetxh = row.xh;
+  if (!targetSqh) return;
+
+  // 先收集需要自动勾选的行（避免在循环中修改数据）
+  const rowsToSelect = reqmainList.value.filter(
+    item => item.sqh === targetSqh && item.xh !== targetxh
+  );
+
+  // 如果有需要自动勾选的行，才开启标志位
+  if (rowsToSelect.length > 0) {
+
+    rowsToSelect.forEach(item => {
+      tableRef.value.toggleRowSelection(item, selected);
+      isAutoSelect.value = true;
+    });
+    setTimeout(() => isAutoSelect.value = false, 0);
+  }
+};
+// 字典格式化方法
+const formatDict = (dictType) => {
+  return (row, column, value) => {
+    // 从全局字典中获取映射值
+    return dictData.value[dictType].find(item => String(item.value) === String(value).trim())?.label || value;
+  };
+};
+// 定义“空数据”的判断函数
+const isEmptyData = (data) => {
+  // 处理 null/undefined
+  if (data === null || data === undefined) return true;
+  // 处理空数组
+  if (Array.isArray(data) && data.length === 0) return true;
+  // 处理空对象（无任何属性）
+  if (typeof data === 'object' && Object.keys(data).length === 0) return true;
+  // 处理空字符串
+  if (typeof data === 'string' && data.trim() === '') return true;
+  return false;
+};
+/**
+ * 获取指定天数偏移后的日期时间字符串
+ * @param {number} days 偏移天数（正数表示未来，负数表示过去）
+ * @returns {string} 格式化的日期时间字符串 'yyyy-mm-dd HH:MM:SS'
+ */
+function getDateOffset(days) {
+  const now = new Date();
+  const offsetTimestamp = now.getTime() + days * 24 * 60 * 60 * 1000;
+  const targetDate = new Date(offsetTimestamp);
+
+  const year = targetDate.getFullYear();
+  const month = String(targetDate.getMonth() + 1).padStart(2, '0');
+  const day = String(targetDate.getDate()).padStart(2, '0');
+  // const hours = String(targetDate.getHours()).padStart(2, '0');
+  // const minutes = String(targetDate.getMinutes()).padStart(2, '0');
+  //const seconds = String(targetDate.getSeconds()).padStart(2, '0');
+  // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  return `${year}-${month}-${day} 00:00:00`;
+}
+function getSubday() {
+  const days = 0 - queryParams.value.subday;
+  queryParams.value.stime = getDateOffset(days);
+  queryParams.value.etime = getDateOffset(1);
+}
+/** 查询采样登记列表 */
+function getList() {
+  freesingle.value = true;
+  if (isEmptyData(queryParams.value.brdh)) proxy.$modal.alert("请刷卡或输入门诊号!");
+  else {
+    loading.value = true;
+    getSubday();
+    querySample(queryParams.value).then(response => {
+      if (isEmptyData(response.data)) proxy.$modal.alert("没有检索的数据!");
+      reqmainList.value = response.data;
+      //   console.log('response:', response.data);
+      loading.value = false;
+      single.value = false;
+      // 新增：数据加载完成后触发全选
+      // 延迟执行（确保DOM已更新）
+      setTimeout(() => {
+        if (tableRef.value) {
+          tableRef.value.toggleAllSelection(); // 调用全选方法
+        }
+      }, 0);
+    });
+  }
+}
+
+// 取消按钮
+function cancel() {
+  // open.value = false;
+  //  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    sqh: null,
+    xh: null,
+    sqxmdh: null,
+    sqxmmc: null,
+    sl: null,
+    dj: null,
+    detailZT: null,
+    detailJJZT: null,
+    ksdh: null,
+    sqys: null,
+    sqsj: null,
+    jsys: null,
+    jssj: null,
+    brly: null,
+    brdh: null,
+    brxm: null,
+    zt: null,
+    jjzt: null,
+    brxb: null,
+    brsr: null,
+    jzbz: null,
+    cp_xmlb: null,
+    cp_color: null,
+    cp_cflag: null,
+    detailBZ1: null,
+    ch: null,
+    detailBZ2: null,
+    bz1: null,
+    bz2: null,
+    bz3: null,
+    yblx: null,
+    zxys: null,
+    zxsj: null,
+    bgddh: null,
+    nl: null,
+    nldw: null,
+    zd: null,
+    cysj: null
+  };
+  freesingle.value = false;
+  single.value = false;
+  proxy.resetForm("reqmainRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList();
+}
+function readCard() {
+  //getList();
+}
+
+
+// 处理病人选择事件
+const handlePatientSelect = (patient) => {
+  // console.log('选中的病人:', patient);
+  queryParams.value.brdh = patient
+  // 处理选中的病人数据
+  handleQuery();
+};
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  if (isAutoSelect.value) return;
+  selectedRows.value = selection;
+  ids.value = selection.map(item => item.sqh);
+}
+
+
+
+/** 打印选择 */
+function printAll(row) {
+  printSigne();
+  printBack();
+}
+/** 单打条码*/
+function printSigne(row) {
+  if (idsnew.value.length === 0) {
+    return;
+  }
+  printBarcodeall(idsnew.value).then(response => {
+    proxy.$modal.msgSuccess("打印成功");
+    open.value = false;
+    freesingle.value = false;
+  }).catch(() => {
+  });
+}
+
+
+/** 打印回单 */
+function printBack(row) {
+  if (idsnew.value.length === 0) {
+    return;
+  }
+  //console.log('idsnew:', idsnew.value)
+  printBackpaper(idsnew.value).then(response => {
+    proxy.$modal.msgSuccess("打印成功");
+    open.value = false;
+  }).catch(() => {
+  });
+}
+
+
+const totalRows = computed(() => {
+  return reqmainList.value.length || 0;
+});
+
+const totalPrice = computed(() => {
+  return reqmainList.value.reduce((sum, row) => {
+    const price = parseFloat(row.dj) || 0;
+    return sum + price;
+  }, 0);
+});
+
+
+// 组件挂载时加载字典
+onMounted(async () => {
+  // 加载病人来源字典
+  const dictRefs = await comDict('PT', 'DP', 'SRD', 'BT', 'SX', 'AU');
+  // 从 ref 中获取实际数据
+  dictData.value = {
+    PT: toRaw(dictRefs.PT.value) || [],
+    DP: toRaw(dictRefs.DP.value) || [],
+    SRD: toRaw(dictRefs.SRD.value) || [],
+    BT: toRaw(dictRefs.BT.value) || [],
+    SX: toRaw(dictRefs.SX.value) || [],
+    AU: toRaw(dictRefs.AU.value) || []
+  };
+});
+
+
+
+// 表格单元格样式（仅作用于“项目类别”列）
+const tableCellStyle = ({ row, column }) => {
+  // 只对“项目类别”列生效
+  if (column.label === '项目类别') {
+    // 1. 转换颜色（十进制→十六进制）
+    const bgColor = classCom.decimalToHexColor(row.cp_color);
+    // 2. 自动计算文字颜色（确保和背景色对比度足够）
+    const textColor = classCom.getContrastTextColor(bgColor);
+
+    return {
+      backgroundColor: bgColor, // 背景色（转换后的值）
+      color: textColor, // 文字色（自动适配）
+      textAlign: 'center', // 文字居中
+      fontWeight: '500' // 文字加粗（提升可读性）
+    };
+  }
+  return {}; // 其他列保持默认样式
+};
+
+
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  display: flex;
+  flex-direction: column;
+  height: 90vh;
+  /* 容器高度等于窗口高度 */
+  overflow: hidden;
+}
+
+.compact-form {
+  height: 75px;
+  /* 固定高度 */
+}
+
+.mb8 {
+  height: 30px;
+  /* 固定高度 */
+}
+
+.table-summary {
+  height: 10px;
+  /* 固定高度 */
+}
+
+.table-container {
+  flex: 1;
+  /* 占满剩余高度 */
+  overflow: hidden;
+  /* 避免表格超出容器 */
+}
+
+.compact-form .el-form-item {
+  padding: 5px;
+  margin-bottom: 5px;
+}
+
+.compact-form .el-form-item__label {
+  padding-bottom: 0px;
+}
+
+
+
+.card-content {
+  max-height: 450px;
+  /* 设置最大高度 */
+  overflow-y: auto;
+  /* 超出高度时显示垂直滚动条 */
+  padding: 5px;
+  /* 保持与卡片默认一致的内边距 */
+}
+
+.clickable:hover {
+  cursor: pointer;
+  /* 鼠标悬停时显示手型 */
+  transition: all 0.3s;
+  /* 平滑过渡效果 */
+  color: blue;
+
+}
+
+/* 汇总行样式 */
+.table-summary {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 6px 16px;
+  margin-top: 8px;
+  background-color: #f5f7fa;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  font-weight: 500;
+  line-height: 24px;
+
+  /* 汇总行文字行高 */
+  .summary-item {
+    display: flex;
+    align-items: center;
+    margin-left: 24px;
+
+    .summary-label {
+      color: #606266;
+      margin-right: 8px;
+    }
+
+    .summary-value {
+      color: #303133;
+      min-width: 40px;
+      text-align: left;
+      /* 核心：数值左对齐 */
+    }
+
+    /* 单独设置"单价合计"的值为红色 */
+    &:nth-child(3) .summary-value {
+      color: #f56c6c;
+      /* Element UI 红色主题色 */
+      font-weight: 600;
+      /* 可选：加粗字体 */
+    }
+  }
+}
+</style>
diff --git a/src/views/regional/circulation/sjdj/index.vue b/src/views/regional/circulation/sjdj/index.vue
new file mode 100644
index 0000000..d619661
--- /dev/null
+++ b/src/views/regional/circulation/sjdj/index.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="5">
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable @change="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable @change="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable @change="handleQuery" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="cz_box">
+      <el-row :gutter="10">
+        <el-col :span="1.5"> 送检医院：</el-col>
+        <el-col :span="4">
+          <SelectTable v-model:data="dstHospCode" :fields="ksdhFields" :tableData="hosList" label="label"
+            :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择" @get-data-value="getValue" />
+        </el-col>
+        <el-col :span="1.5"> <el-button type="primary" :size="aotuSize" @click="sjHandle(30)">标本送检</el-button></el-col>
+        <el-col :span="1.5"> <el-button type="primary" :size="aotuSize" @click="sjHandle(20)">取消送检</el-button></el-col>
+      </el-row>
+    </div>
+
+    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+      <template #patAge="{ row }">
+        {{ row.patAge }}{{ row.ageUnit }}
+      </template>
+      <template #status="{ row }">
+        {{ formatDict(row.status, regdictList) }}
+      </template>
+      <template #patSex="{ row }">
+        {{ row.patSex == 1 ? '男' : '女' }}
+      </template>
+    </CustomTable>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { querySample, sampleSign } from '@/api/regional/index'
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import SelectTable from '@/components/SelectTable/index.vue';
+import { classCom } from '@/utils/classCom';
+import { ElMessage } from 'element-plus';
+const aotuSize = classCom.useAutoSize();
+
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1,
+  Status: '30'
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { type: 'selection', align: 'center', visible: true, width: 40 },
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 250 },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 60 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 250 },
+  { prop: 'sampleTypeName', label: '标本类型', align: 'center', visible: true, },
+  { prop: 'status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  { prop: 'affirmUserName', label: '采样人', align: 'center', visible: true, },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'affirmTime', label: '送检时间', align: 'center', visible: true, },
+  { prop: 'dstHospName', label: '检测机构名称', align: 'center', visible: true, },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '70vh', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  // fit: true, // 列宽自适应
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+
+const dstHospName = ref('')
+const dstHospCode = ref('')
+
+const barcodes = ref([])
+const handleSelectionChange = (val: any) => {
+  barcodes.value = val.map((item: any) => item.barcode)
+}
+const getValue = (val: any) => {
+  console.log('val==>', val);
+  dstHospName.value = val.label
+}
+const sjHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  if (!dstHospCode.value) return ElMessage.warning('请选择送检医院！')
+  const params = {
+    barcode: barcodes.value,
+    dstHospName: dstHospName.value,
+    dstHospCode: dstHospCode.value,
+    status: val
+  }
+  sampleSign(params).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      handleQuery()
+      dstHospCode.value = ''
+    }
+  })
+}
+
+
+
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+    Status: '30'
+  }
+  handleQuery()
+}
+const getList = () => {
+  querySample(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  getList()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+
+.btns {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  &>button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 5px;
+  }
+}
+
+.cz_box {
+  padding: .3125rem 0;
+  border-top: 1px solid #ccc;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/zycy/index.vue b/src/views/regional/circulation/zycy/index.vue
new file mode 100644
index 0000000..32be0b8
--- /dev/null
+++ b/src/views/regional/circulation/zycy/index.vue
@@ -0,0 +1,802 @@
+<template>
+  <div class="app-container ">
+    <div ref="compactForm">
+      <el-row :gutter="10" class="compact-form" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" :size="aotuSize" :rules="queryRules">
+          <el-form-item label="日期：" prop="failed1">
+            <el-date-picker v-model="queryParams.times" type="datetimerange" range-separator="-"
+              start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss" @change="handletime" style="width: 25rem;" />
+          </el-form-item>
+
+          <el-form-item label="委托机构：" prop="SrcHospName">
+            <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList" label="label"
+              width="12.5rem" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择委托机构" />
+          </el-form-item>
+          <el-form-item label="条码状态：" prop="zt">
+            <el-select v-model="queryParams.zt" placeholder="请选择" style="width: 6.25rem;">
+              <el-option v-for="item in dictData.ST" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="failed4">
+            <el-select v-model="queryParams.failed4" placeholder="请选择" style="width:8.75rem">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="failed5">
+            <el-input v-model="queryParams.failed5" clearable placeholder="条件搜索" @keyup.enter="handleQuery"
+              @clear="handleQuery" />
+          </el-form-item>
+
+          <el-form-item label="">
+            <el-button icon="search" type="primary" @click="handleQuery" :size="aotuSize"> 搜索 </el-button>
+            <el-button icon="Refresh" @click="resetQuery" :size="aotuSize">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+
+    </div>
+
+    <el-row :gutter="10">
+      <el-col :span="16" class="right-table">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" :size="aotuSize" :loading="btnLoading" plain icon="Plus"
+              @click="printHandle">生成条码</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" :size="aotuSize" plain icon="Edit" @click="selectStatusRows">选中所有未打印</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" :size="aotuSize" plain @click="printPdf">打印条码</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" :size="aotuSize" plain icon="Upload" @click="openBlock('采样登记')">采样登记</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" :size="aotuSize" plain @click="openBlock('送检登记')">送检登记</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" :size="aotuSize" plain @click="goReport">报告查询</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" :size="aotuSize" plain @click="cancelHandle">条码作废</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" :size="aotuSize" plain @click="sendSampleHandle">清单打印</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" :size="aotuSize" plain @click="changePrinter">打印机设置</el-button>
+          </el-col>
+        </el-row>
+
+        <CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :loading="loading"
+          @row-click="rowHandle" @selection-change="selectionChange" :enable-column-drag="true"
+          @column-drag-end="handleColumnDragEnd">
+          <template #dy="{ row }">
+            <svg-icon v-if="row.zt != 1" icon-class="lvgou" />
+          </template>
+          <template #srcHospName="{ row }">
+            武汉市汉阳区江堤街社区卫生服务中心
+          </template>
+          <template #jzbz="{ row }">
+            {{ row.jzbz == '1' ? '急' : '' }}
+          </template>
+          <template #jjzt="{ row }">
+            {{ row.jjzt == '1' ? '计价' : '无' }}
+          </template>
+          <template #brly="{ row }">
+            {{ formatDict(row.brly, 'PT') }}
+          </template>
+          <template #zt="{ row }">
+            {{ formatDict(row.zt.trim(), 'ST') }}
+          </template>
+          <template #yljg="{ row }">
+            {{ formatDict(row.yljg, 'HOS') }}
+          </template>
+        </CustomTable>
+
+      </el-col>
+      <el-col :span="8" class="right-table">
+        <!-- <div class="title"> 项目 </div> -->
+        <el-button type="primary" plain class="mb8" :size="aotuSize">拆分选中项目</el-button>
+        <CustomTable :data="rightTableData" :columns="rightColumns" :config="rightTableConfig">
+          <template #jjzt="{ row }">
+            {{ row.jjzt == '1' ? '计价' : '无' }}
+          </template>
+          <template #zt="{ row }">
+            {{ formatDict(row.zt, 'ST') }}
+          </template>
+        </CustomTable>
+      </el-col>
+    </el-row>
+
+    <!-- 样本流程 -->
+    <div class="time-line-box">
+      <div v-for="(item, i) in timelineItems" :key="i" class="time-line-item">
+        <div v-if="i != 0" class="timeline-connector">
+          <img class="timg" src="@/assets/images/yjt.png" alt="">
+        </div>
+        <div :class="['timeline-content', i > lastTimeIndex ? 'no_active' : '']">
+          <div :class="['index', lastTimeIndex == i ? 'active' : '']">{{ i + 1 }}</div>
+          <div class="timeline-title">{{ item.title }}</div>
+          <div class="timeline-time">{{ item.time }}</div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- 采样登记 -->
+    <el-dialog v-model="dialogVisible" :title="title" draggable :close-on-click-modal="false" width="70vw"
+      @close="closeDialog">
+      <div class="flex-between">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-input v-model="sqhText" clearable placeholder="条形码" @keyup.enter="sqdQuery" @clear="sqdQuery" />
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="sqdQuery" plain>读取</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="delete">删除选中行</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain>打印</el-button>
+          </el-col>
+        </el-row>
+        <!-- <el-button type="primary" plain>保存</el-button> -->
+      </div>
+      <CustomTable :data="cyTableData" :columns="cyColumns" :config="cyTableConfig">
+        <template #zt="{ row }">
+          {{ formatDict(row.zt, 'ST') }}
+        </template>
+      </CustomTable>
+    </el-dialog>
+
+    <el-dialog v-model="previewShow" title="预览" width="90vw" :close-on-click-modal="false">
+      <iFrame v-if="pdfUrl" :src="pdfUrl" />
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRaw, computed, watch, nextTick, onMounted, } from 'vue';
+import { HiprintPrinter } from '@/utils/hiprintPrinter';
+import { classCom } from '@/utils/classCom';
+import CustomTable from '@/components/elTable/index.vue'
+import { useRouter } from 'vue-router'
+import { usePrintStore } from '@/store/modules/printStore'
+import { fetchCodeList, addObj, fetchCodeDetail, fetchCodeExec, fetchCodeReqmain, printSendSample, printsetup } from '@/api/checkCode/index'
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+const aotuSize = classCom.useAutoSize();
+//@ts-ignore 
+import { comDict } from '@/utils/dict'
+import SelectTable from '@/components/SelectTable/index.vue';
+import { ElMessage, ElMessageBox } from 'element-plus'
+// @ts-ignore
+import iFrame from "@/components/iFrame/index.vue";
+import { checkPrintService } from '@/utils/printHelper';
+const router = useRouter()
+const printStore = usePrintStore();
+const printerList = computed(() => printStore.printerList);
+const printName = ref(printStore.defaultPrinter || '');
+const compactForm = ref<HTMLElement | null>(null);
+const heightForm = ref(90);
+const dialogVisible = ref(false)
+const title = ref('采样登记')
+const sqhText = ref('')
+const tableRef = ref()
+interface QueryParams {
+  times: string[]; // 明确类型为字符串元组
+  yljg: string;
+  zt: string;
+  failed4: string;
+  failed5: string;
+  SrcHospName: string;
+  userid: string;
+}
+// 提交表单数据
+const queryParams = reactive<QueryParams>({
+  times: ['2025-07-18 00:00:00', '2025-07-18 23:59:59'],
+  userid: '',
+  yljg: '1',
+  zt: '',
+  SrcHospName: '',
+  failed4: '',
+  failed5: '',
+});
+const showSearch = ref(true);
+const queryRef = ref()
+// 定义校验规则
+const queryRules = ref({
+  // clientId: [
+  //   { required: true, message: '编号不能为空', trigger: 'blur' },
+
+  // ],
+
+  // failed3: [
+  //   { required: true, message: '条码状态不能为空', trigger: 'change' },
+  // ],
+})
+const options = [
+  {
+    value: '1',
+    label: '通过姓名搜索',
+  },
+  {
+    value: '2',
+    label: '通过病人号搜索',
+  },
+  {
+    value: '3',
+    label: '通过床号搜索',
+  },
+]
+interface DictData {
+  SX?: Array<any>;
+  HOS?: Array<any>;
+  [key: string]: any[] | undefined; // 添加索引签名以支持动态访问
+}
+// 字典数据存储
+const dictData = ref<DictData>({});
+const handleQuery = async () => {
+  const valid = await queryRef.value.validate().catch(() => { });
+  if (!valid) return false;
+  getList()
+}
+// 重置
+const resetQuery = () => {
+  queryRef.value?.resetFields();
+
+  getList()
+}
+
+const loading = ref(true);
+
+
+
+// 数据源
+const tableData = ref([])
+// 配置项
+const columns = ref([
+  { type: 'selection', visible: true, align: 'center', width: 40, label: '多选框' },
+  { prop: 'srcHospName', label: '委托机构', visible: true, align: 'center', width: 200, slot: 'srcHospName' },
+  { prop: 'zt', label: '打印', visible: true, align: 'center', slot: 'dy', width: 40 },
+  { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 30 },
+  { prop: 'ch', label: '床号', visible: true, align: 'center', width: 40 },//sortable: true,
+  { prop: 'brxm', label: '姓名', align: 'center', visible: true, width: 50 },
+  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 30 },
+  { prop: 'jymd', label: '项目名称', visible: true, width: 130 },
+  { prop: 'bgddhname', label: '类别', align: 'center', visible: true, width: 80 },
+  { prop: 'sampletips', label: '采样提示', align: 'center', visible: true, width: 60 },
+  { prop: 'yblx', label: '样本类型', align: 'center', visible: true, width: 60 },
+  { prop: 'brdh', label: '病人号', align: 'center', visible: true, width: 90 },
+  { prop: 'ksname', label: '科室名称', align: 'center', visible: true, width: 100 },
+  { prop: 'sqh', label: '申请号/条码', align: 'center', visible: true, width: 100 },
+  { prop: 'zt', label: '状态', align: 'center', visible: true, slot: 'zt', width: 40 },
+  { prop: 'brly', label: '病人来源', align: 'center', visible: true, slot: 'brly', width: 60 },
+  { prop: 'sqysname', label: '申请医生', align: 'center', visible: true, width: 60 },
+  { prop: 'sqsj', label: '申请时间', align: 'center', visible: true, width: 150 },
+  { prop: 'jjzt', label: '计价标志', align: 'center', visible: true, slot: 'jjzt', width: 60 },
+  { prop: 'zxysname', label: '执行医生', align: 'center', visible: true, width: 60 },
+  { prop: 'bbsjrname', label: '送检人', align: 'center', visible: true, width: 50 },
+  { prop: 'yljg', label: '检验机构', align: 'center', visible: true, slot: 'yljg', width: 150 },
+])
+
+const single = ref(true);
+const multiple = ref(true);
+const sqhs = ref([]);
+// 单元格样式
+const cellStyleHd = ({ row, column, rowIndex, columnIndex }: {
+  row: any;
+  column: any;
+  rowIndex: number;
+  columnIndex: number;
+}) => {
+  // console.log(row, column, rowIndex, columnIndex);
+  if (column.label == "急" && row.jzbz == "1") {
+    return { color: '#f00' };
+  }
+
+  if (column.label == "类别") {
+    const bgColor = classCom.decimalToHexColor(row.bkcolor);
+    const textColor = classCom.getContrastTextColor(bgColor);
+    return {
+      backgroundColor: `${bgColor} !important`,
+      color: textColor,
+    };
+  }
+};
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+
+const rowClassNameHd = ({ row, rowIndex }: {
+  row: any;
+  rowIndex: number;
+}) => {
+  return 'custom-row-class'; // 返回自定义类名
+};
+
+// 时间线数据
+const timelineItems = ref(
+  [
+    { title: '检验申请', time: '' },
+    { title: '标本采集', time: '' },
+    { title: '标本送检', time: '' },
+    { title: '标本签收', time: '' },
+    { title: '上机检验', time: '' },
+    { title: '结果审核', time: '' },
+  ]
+);
+
+// 计算最后一个有时间的节点索引
+const lastTimeIndex = computed(() => {
+
+  const lastIndex = timelineItems.value.findLastIndex(item => item.time);
+  if (lastIndex === -1) {
+    return -1
+  } else {
+    return lastIndex;
+  }
+});
+
+// 点击行
+const rowHandle = (row: any) => {
+  timelineItems.value =
+    [
+      { title: '检验申请', time: row.sqsj },
+      { title: '标本采集', time: row.cysj },
+      { title: '标本送检', time: row.bbsjsj },
+      { title: '标本签收', time: row.jssj },
+      { title: '上机检验', time: row.sjsj },
+      { title: '结果审核', time: row.confirmtime },
+    ]
+  getRightTable(row)
+};
+
+const selectionChange = (selection: any) => {
+  sqhs.value = selection;
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+const handleColumnDragEnd = (data: any) => {
+  // 更新列配置
+  columns.value = data.columns;
+  // 可以在这里保存列顺序到本地存储等
+  // localStorage.setItem('tableColumnOrder', JSON.stringify(data.columns));
+};
+
+// 左侧表格配置
+const tableConfig = ref({
+  // stripe: true, // 斑马纹
+  border: true, // 边框
+  index: true, // 序号
+  height: '', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  cellStyle: cellStyleHd,
+  rowClassName: rowClassNameHd,
+  fit: true
+})
+// 右侧数据源
+const rightTableData = ref([])
+// 配置项
+const rightColumns = ref([
+  { prop: 'sqxmdh', label: '项目代号', visible: true, sortable: true, width: '110px' },
+  { prop: 'sqxmmc', label: '项目名称', visible: true, width: '120px' },
+  { prop: 'dj', label: '单价', align: 'center', visible: true, },
+  { prop: 'sl', label: '数量', align: 'center', visible: true, },
+  { prop: 'zt', label: '状态', align: 'center', visible: true, slot: 'zt', },
+  { prop: 'jjzt', label: '计价标志', align: 'center', visible: true, slot: 'jjzt', },
+
+])
+// 表格配置
+const rightTableConfig = ref({
+  // stripe: true, // 斑马纹
+  border: true, // 边框
+  height: '', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+})
+
+// 采样数据源
+const cyTableData = ref([])
+// 配置项
+const cyColumns = ref([
+  { prop: 'sqh', label: '申请号/条形码', align: 'center', visible: true, sortable: true, width: 140 },
+  { prop: 'ksdh', label: '科室病区', align: 'center', visible: true, width: 120 },
+  { prop: 'ch', label: '床号', align: 'center', visible: true, sortable: true, },
+  { prop: 'brxm', label: '姓名', align: 'center', visible: true, },
+  { prop: 'brdh', label: '病人号', align: 'center', visible: true, },
+  { prop: 'brxb', label: '性别', align: 'center', visible: true, },
+  { prop: 'yblx', label: '样本类型', align: 'center', visible: true, },
+  { prop: 'zt', label: '状态', align: 'center', visible: true, slot: 'zt', },
+  { prop: 'jzbz', label: '急诊', align: 'center', visible: true, },
+  { prop: 'jjzt', label: '采样人', align: 'center', visible: true, },
+  { prop: 'cysj', label: '采样时间', align: 'center', visible: true, },
+  { prop: 'zxysname', label: '执行医生', align: 'center', visible: true, },
+  { prop: 'zxsj', label: '执行时间', align: 'center', visible: true, },
+])
+// 表格配置
+const cyTableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+})
+
+
+
+// 采样登记
+const openBlock = (value: string) => {
+  if (sqhs.value.length > 0) {
+    ElMessageBox.confirm(`确定操作选中的数据吗？`, "提示", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      beforeClose: async (action, instance, done) => {
+        if (action === "confirm") {
+          // 生成请求Promise数组
+          const requests = sqhs.value.map((item: any) => { return item.sqh });
+          fetchCodeExec({
+            sqh: requests.join(','),
+            userid: 'lis',
+            status: value == '采样登记' ? 12 : 13,
+            yljg: 1
+          }).then((res: any) => {
+            if (res.code == 0) {
+              ElMessage.success('调用成功');
+              done();
+              getList()
+            } else {
+              ElMessage.error('调用失败');
+            }
+          })
+        } else {
+          done();
+        }
+      },
+    }).catch(() => { });
+
+  } else {
+    title.value = value
+    dialogVisible.value = true
+  }
+}
+// 采样读取
+const sqdQuery = () => {
+  const index = cyTableData.value.findIndex((item: any) => item.sqh == sqhText.value)
+  if (index !== -1) return ElMessage.warning('该申请单数据已存在！')
+
+  fetchCodeReqmain({ sqh: sqhText.value }).then((res: any) => {
+    if (res.code == 0 && res.data.sqh) {
+      fetchCodeExec({
+        sqh: res.data.sqh,
+        userid: 'lis',
+        status: 12,
+        yljg: 1
+      })
+      cyTableData.value = cyTableData.value.concat(res.data)
+    }
+  })
+}
+// 关闭弹窗清空
+const closeDialog = () => {
+  cyTableData.value = []
+  sqhText.value = ''
+}
+
+
+interface ColumnItem {
+  prop: string;
+  label: string;
+  visible: boolean;
+  key: number;
+  align: string;
+  slot: string;
+  width: string;
+}
+// 更新列
+// const updateColumns = (arr: Array<ColumnItem>) => {
+//   columns.value = arr
+// };
+
+const getRightTable = (row: any) => {
+  fetchCodeDetail({ sqh: row.sqh }).then((res: any) => {
+    if (res.code == 0) {
+      rightTableData.value = res.data
+    }
+  })
+}
+
+
+
+const goReport = () => {
+  // 跳转到报告查询页面
+  router.push('/regional/inspectionReport/report?startdate=2025-08-19&endate=2025-08-19&deptcode=0210&userid=00910&brdh=')
+};
+
+const cancelHandle = () => {
+  if (sqhs.value.length <= 0) return ElMessage.warning('请选择数据！')
+  ElMessageBox.confirm(`确定作废选中的数据吗？`, "提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    beforeClose: async (action, instance, done) => {
+      if (action === "confirm") {
+        const requests = sqhs.value.map((item: any) => { return item.sqh });
+        fetchCodeExec({
+          sqh: requests.join(','),
+          userid: 'lis',
+          status: 9,
+          yljg: 1
+        }).then((res: any) => {
+          if (res.code == 0) {
+            ElMessage.success('调用成功');
+            done();
+            getList()
+          } else {
+            ElMessage.error('调用失败');
+          }
+        })
+      } else {
+        done();
+      }
+    },
+  }).catch(() => { });
+}
+
+const pdfUrl = ref('')
+const previewShow = ref(false)
+
+const sendSampleHandle = () => {
+  const selections = tableRef.value.allSelection()
+  if (selections.length <= 0) return ElMessage.warning('请选择数据！')
+  const arr = selections.map((item: any) => { return item.sqh });
+  printSendSample(arr).then((res: any) => {
+    if (res.code == 0) {
+      const url = res.data
+      if (!url) return ElMessage.warning('未查询到文件')
+      pdfUrl.value = `data:application/pdf;base64,${url}`
+      previewShow.value = true
+    }
+  })
+}
+
+
+
+const changePrinter = (value: string) => {
+  checkPrintService().then((isConnected) => {
+    if (isConnected) {
+      printsetup()
+    }
+  })
+};
+
+const hosList = ref([])
+onMounted(async () => {
+  // 初始化3天区间（今天-前两天）
+  // const end = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  // const start = dayjs().subtract(2, 'day').format('YYYY-MM-DD HH:mm:ss'); //add 时间往后
+  // queryParams.times = [start, end];
+  // console.log(queryParams.times);
+  getList()
+  adjustTableHeight();
+  // 加载病人来源字典
+  const dictRefs = await comDict('PT', 'HOS', 'ST');
+
+  // 从 ref 中获取实际数据
+  dictData.value = {
+    PT: toRaw(dictRefs.PT.value) || [],
+    HOS: toRaw(dictRefs.HOS.value) || [],
+    ST: toRaw(dictRefs.ST.value) || [],
+  };
+
+
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  });
+})
+
+// 字典格式化方法
+const formatDict = (v: string, dictType: string) => {
+  return dictData.value[dictType]?.find((item: any) => item.value == v)?.label || v;
+};
+
+// 计算table高度
+watch(showSearch, () => {
+  nextTick(() => {
+    adjustTableHeight();
+  })
+}, { immediate: true });
+
+function adjustTableHeight() {
+  if (compactForm.value) {
+    // 获取高度
+    heightForm.value = compactForm.value.offsetHeight;
+    tableConfig.value.height = `calc(74vh - ${heightForm.value}px)`; // 设置表格容器的高度
+    rightTableConfig.value.height = `calc(74vh - ${heightForm.value}px)`;
+  }
+}
+
+const handletime = (val: Array<string>) => {
+  // console.log('时间', val);
+}
+
+const btnLoading = ref(false);
+
+// 生成条码
+const printHandle = () => {
+  btnLoading.value = true;
+  const data = {
+    dept: '0235',
+    userid: 'lis',
+    st: '',
+    et: '',
+    yljg: queryParams.yljg
+  }
+  if (queryParams.times && queryParams.times.length) {
+    data.st = queryParams.times[0]
+    data.et = queryParams.times[1]
+  }
+  addObj(data).then((res: any) => {
+    if (res.code == 0) {
+      getList()
+    }
+  }).finally(() => {
+    btnLoading.value = false;
+  });
+
+}
+
+// 查询申请单
+const getList = () => {
+  loading.value = true;
+  const data = {
+    dept: '0235',
+    userid: 'lis',
+    st: queryParams.times[0],
+    et: queryParams.times[1],
+    yljg: queryParams.yljg
+  }
+  fetchCodeList(data).then((response: any) => {
+    if (response.code == 0) {
+      loading.value = false;
+      tableData.value = response.data
+      if (tableData.value.length > 0) {
+        rowHandle(response.data[0])
+        getRightTable(response.data[0])
+        tableRef.value.setCurrentRow(response.data[0])
+      }
+    }
+  })
+}
+
+const selectStatusRows = () => {
+  tableRef.value.clearSelection()
+  tableData.value.forEach((item: any) => {
+    if (item.zt == 1) {
+      tableRef.value.toggleRowSelection(item, true)
+    }
+  })
+}
+
+// 打印pdf
+const printPdf = () => {
+  checkPrintService().then((isConnected) => {
+    if (!isConnected) return
+
+    const selections = tableRef.value.allSelection()
+    if (selections.length <= 0) return ElMessage.warning('请选择数据！')
+
+    ElMessageBox.confirm(`确定打印选中的数据吗？`, "提示", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      beforeClose: async (action, instance, done) => {
+        if (action === "confirm") {
+          const requests = selections.map((item: any) => item.sqh)
+          const res = await fetchCodeExec({
+            sqh: requests.join(','),
+            userid: queryParams.userid,
+            status: 11,
+            yljg: queryParams.yljg
+          })
+          if (res.code === 0) {
+            done()
+            getList()
+          }
+        } else {
+          done()
+        }
+      },
+    }).catch(() => { })
+  })
+}
+</script>
+
+<style scoped lang="scss">
+.custom-row-class {
+  background-color: #c6c3ff !important;
+  /* 设置行背景色 */
+}
+
+.right-table {
+  border: 1px solid #E1E9F7;
+  padding-top: .3125rem;
+}
+
+.title {
+  border-bottom: 1px solid #E1E9F7;
+  margin-bottom: .625rem;
+  padding: .625rem;
+  font-weight: 700;
+}
+
+.time-line-box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin-top: .35rem;
+  background-color: #f0f3f8;
+  padding: .3rem 2.5rem;
+}
+
+.time-line-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 16.6%;
+  // padding: 0 30px;
+
+  .timeline-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .index {
+      width: 1.875rem;
+      height: 1.875rem;
+      line-height: 1.875rem;
+      background: #E1E9F7;
+      border-radius: 50%;
+      text-align: center;
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 500;
+      font-size: 1.125rem;
+      color: #4767A3;
+    }
+
+    .active {
+      background-color: #4096ff;
+      box-shadow: 0 0 0 .25rem rgba(64, 150, 255, 0.2);
+      color: #FFF;
+    }
+
+    .timeline-title {
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 500;
+      font-size: 1rem;
+      color: #4767A3;
+    }
+
+    .timeline-time {
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 400;
+      font-size: .875rem;
+      color: #4767A3;
+    }
+
+  }
+
+  .timg {
+    width: 3.125rem;
+  }
+
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/dict/diagnosis/index.vue b/src/views/regional/dict/diagnosis/index.vue
new file mode 100644
index 0000000..0772892
--- /dev/null
+++ b/src/views/regional/dict/diagnosis/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="诊断编码" prop="diagCode">
+        <el-input v-model="queryParams.diagCode" placeholder="请输入诊断编码" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="诊断名称" prop="diagName">
+        <el-input v-model="queryParams.diagName" placeholder="请输入诊断名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="诊断状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="诊断编号" align="center" prop="diagId" />
+      <el-table-column label="诊断编码" align="center" prop="diagCode" />
+      <el-table-column label="诊断名称" align="center" prop="diagName" />
+      <el-table-column label="诊断排序" align="center" prop="diagSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改诊断对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="diagnosisRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="诊断名称" prop="diagName">
+          <el-input v-model="form.diagName" placeholder="请输入诊断名称" />
+        </el-form-item>
+        <el-form-item label="诊断编码" prop="diagCode">
+          <el-input v-model="form.diagCode" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="诊断顺序" prop="diagSort">
+          <el-input-number v-model="form.diagSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="诊断状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+              }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="diagnosis">
+import { listdiagnosis, adddiagnosis, deldiagnosis, getdiagnosis, updatediagnosis } from "@/api/regional/dict/diagnosis";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const diagnosisList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 15,
+    diagCode: undefined,
+    diagName: undefined,
+    status: undefined
+  },
+  rules: {
+    diagName: [{ required: true, message: "诊断名称不能为空", trigger: "blur" }],
+    diagCode: [{ required: true, message: "诊断编码不能为空", trigger: "blur" }],
+    diagSort: [{ required: true, message: "诊断顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询诊断列表 */
+function getList() {
+  loading.value = true;
+  listdiagnosis(queryParams.value).then(response => {
+    diagnosisList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    diagId: undefined,
+    diagCode: undefined,
+    diagName: undefined,
+    diagSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("diagnosisRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.diagId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加诊断";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const diagId = row.diagId || ids.value;
+  getdiagnosis(diagId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改诊断";
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["diagnosisRef"].validate(valid => {
+    if (valid) {
+      if (form.value.diagId != undefined) {
+        updatediagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        adddiagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const diagIds = row.diagId || ids.value;
+  proxy.$modal.confirm('是否确认删除诊断编号为"' + diagIds + '"的数据项？').then(function () {
+    return deldiagnosis(diagIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("system/diagnosis/export", {
+    ...queryParams.value
+  }, `diag_${new Date().getTime()}.xlsx`);
+}
+
+getList();
+</script>
diff --git a/src/views/regional/dict/hospital/index.vue b/src/views/regional/dict/hospital/index.vue
new file mode 100644
index 0000000..56881fe
--- /dev/null
+++ b/src/views/regional/dict/hospital/index.vue
@@ -0,0 +1,227 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="医疗机构编码" prop="hospitalCode">
+        <el-input v-model="queryParams.hospitalCode" placeholder="请输入医疗机构编码" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医疗机构名称" prop="hospitalName">
+        <el-input v-model="queryParams.hospitalName" placeholder="请输入医疗机构名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="有效状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="hospitalId" />
+      <el-table-column label="医疗机构编码" align="center" prop="hospitalCode" />
+      <el-table-column label="医疗机构名称" align="center" prop="hospitalName" />
+      <el-table-column label="接口平台密钥" align="center" prop="hospitalUserinfo" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改医疗机构对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="医疗机构名称" prop="hospitalName">
+          <el-input v-model="form.hospitalName" placeholder="请输入医疗机构名称" />
+        </el-form-item>
+        <el-form-item label="医疗机构编码" prop="hospitalCode">
+          <el-input v-model="form.hospitalCode" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="医疗机构密钥" prop="hospitalUserinfo">
+          <el-input v-model="form.hospitalUserinfo" placeholder="请输入编码密钥" />
+        </el-form-item>
+        <el-form-item label="医疗机构状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="hospital">
+import { listhospital, addhospital, delhospital, gethospital, updatehospital } from "@/api/regional/dict/hospital.js";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const postList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    hospitalCode: undefined,
+    hospitalName: undefined,
+    status: undefined
+  },
+  rules: {
+    hospitalName: [{ required: true, message: "医疗机构名称不能为空", trigger: "blur" }],
+    hospitalCode: [{ required: true, message: "医疗机构编码不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询医疗机构列表 */
+function getList() {
+  loading.value = true;
+  listhospital(queryParams.value).then(response => {
+    postList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    hospitalId: undefined,
+    hospitalCode: undefined,
+    hospitalName: undefined,
+    hospitalUserinfo: undefined,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("postRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.hospitalId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加医疗机构";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const hospitalId = row.hospitalId || ids.value;
+  gethospital(hospitalId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改医疗机构";
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["postRef"].validate(valid => {
+    if (valid) {
+      if (form.value.hospitalId != undefined) {
+        updatehospital(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addhospital(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const hospitalIds = row.hospitalId || ids.value;
+  proxy.$modal.confirm('是否确认删除医疗机构编号为"' + hospitalIds + '"的数据项？').then(function () {
+    return delhospital(hospitalIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("transitdict/hospital/export", {
+    ...queryParams.value
+  }, `hospital_${new Date().getTime()}.xlsx`);
+}
+
+getList();
+</script>
diff --git a/src/views/regional/dict/item/index.vue b/src/views/regional/dict/item/index.vue
new file mode 100644
index 0000000..89b1f33
--- /dev/null
+++ b/src/views/regional/dict/item/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/views/regional/dict/itemclass/index.vue b/src/views/regional/dict/itemclass/index.vue
new file mode 100644
index 0000000..379c4b6
--- /dev/null
+++ b/src/views/regional/dict/itemclass/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="项目类别编码" prop="itemclassCode">
+        <el-input v-model="queryParams.itemclassCode" placeholder="请输入项目类别编码" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="项目类别名称" prop="itemclassName">
+        <el-input v-model="queryParams.itemclassName" placeholder="请输入项目类别名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="有效状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"
+      :cell-style="tableCellStyle">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="itemclassId" />
+      <el-table-column label="项目类别编码" align="center" prop="itemclassCode" />
+      <el-table-column label="项目类别名称" align="center" prop="itemclassName" show-overflow-tooltip />
+      <el-table-column label="试管名称" align="center" prop="itemclassTips" show-overflow-tooltip />
+      <el-table-column label="试管颜色" align="center" prop="itemclassBkcolor" show-overflow-tooltip />
+      <el-table-column label="默认样本类型" align="center" prop="itemclassYblx" show-overflow-tooltip />
+      <el-table-column label="打印次数" align="center" prop="itemclassPrintcnt" />
+      <el-table-column label="抗凝样本" width="80" align="center" prop="itemclassKn">
+        <template #default="scope">
+          <el-checkbox :checked="scope.row.itemclassKn === 1 || scope.row.itemclassKn === '1'" disabled />
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" align="center" prop="itemclassSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改项目类别对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目类别名称" prop="itemclassName">
+          <el-input v-model="form.itemclassName" placeholder="请输入类别名称" />
+        </el-form-item>
+        <el-form-item label="项目类别编码" prop="itemclassCode">
+          <el-input v-model="form.itemclassCode" placeholder="请输入类别编码" />
+        </el-form-item>
+        <el-form-item label="试管名称" prop="itemclassTips">
+          <el-input v-model="form.itemclassUserinfo" placeholder="请输入试管名称" />
+        </el-form-item>
+        <el-form-item label="试管颜色" prop="itemclassBkcolor">
+          <el-input-number v-model="form.itemclassBkcolor" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="默认样本类型" prop="itemclassYblx">
+          <el-input v-model="form.itemclassYblx" placeholder="请输入默认样本类型" />
+        </el-form-item>
+        <el-form-item label="打印次数" prop="itemclassPrintcnt">
+          <el-input-number v-model="form.itemclassPrintcnt" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="抗凝样本" prop="itemclassKn">
+          <el-checkbox v-model="form.itemclassKn" true-label="1" false-label="0" />
+        </el-form-item>
+        <el-form-item label="类别顺序" prop="itemclassSort">
+          <el-input-number v-model="form.itemclassSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="项目类别状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+              }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="itemclass">
+import { listitemclass, additemclass, delitemclass, getitemclass, updateitemclass } from "@/api/regional/dict/itemclass.js";
+import { classCom } from '@/utils/classCom';
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const postList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 15,
+    itemclassCode: undefined,
+    itemclassName: undefined,
+    status: undefined
+  },
+  rules: {
+    itemclassName: [{ required: true, message: "项目类别名称不能为空", trigger: "blur" }],
+    itemclassCode: [{ required: true, message: "项目类别编码不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询项目类别列表 */
+function getList() {
+  loading.value = true;
+  listitemclass(queryParams.value).then(response => {
+    postList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    itemclassId: undefined,
+    itemclassCode: undefined,
+    itemclassName: undefined,
+    itemclassUserinfo: undefined,
+    itemclassTips: undefined,
+    itemclassBkcolor: 255,
+    itemclassYblx: undefined,
+    itemclassPrintcnt: 1,
+    itemclassKn: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("postRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.itemclassId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加项目类别";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const itemclassId = row.itemclassId || ids.value;
+  getitemclass(itemclassId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改项目类别";
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["postRef"].validate(valid => {
+    if (valid) {
+      if (form.value.itemclassId != undefined) {
+        updateitemclass(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        additemclass(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const itemclassIds = row.itemclassId || ids.value;
+  proxy.$modal.confirm('是否确认删除项目类别编号为"' + itemclassIds + '"的数据项？').then(function () {
+    return delitemclass(itemclassIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("transitdict/itemclass/export", {
+    ...queryParams.value
+  }, `itemclass_${new Date().getTime()}.xlsx`);
+}
+const tableCellStyle = ({ row, column }) => {
+  // 只对“项目类别”列生效
+  if (column.label === '试管颜色') {
+    // 1. 转换颜色（十进制→十六进制）
+    const bgColor = classCom.decimalToHexColor(row.itemclassBkcolor);
+    // 2. 自动计算文字颜色（确保和背景色对比度足够）
+    const textColor = classCom.getContrastTextColor(bgColor);
+
+    return {
+      backgroundColor: bgColor, // 背景色（转换后的值）
+      color: textColor, // 文字色（自动适配）
+      textAlign: 'center', // 文字居中
+      fontWeight: '500' // 文字加粗（提升可读性）
+    };
+  }
+  return {}; // 其他列保持默认样式
+};
+
+getList();
+</script>
diff --git a/src/views/regional/dict/itemvs/index.vue b/src/views/regional/dict/itemvs/index.vue
new file mode 100644
index 0000000..89b1f33
--- /dev/null
+++ b/src/views/regional/dict/itemvs/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/views/regional/dict/regdict/index.vue b/src/views/regional/dict/regdict/index.vue
new file mode 100644
index 0000000..7bd03d1
--- /dev/null
+++ b/src/views/regional/dict/regdict/index.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item :label="menuname + '编码'" prop="dictCode">
+        <el-input v-model="queryParams.dictCode" :placeholder="`请输入${menuname}编码`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="`${menuname}名称`" prop="dictName">
+        <el-input v-model="queryParams.dictName" :placeholder="`请输入${menuname}名称`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="`${menuname}编号`" align="center" prop="dictId" v-if="false" />
+      <el-table-column :label="`${menuname}编码`" align="center" prop="dictCode" />
+      <el-table-column :label="`${menuname}名称`" align="center" prop="dictName" />
+      <el-table-column label="排序" align="center" prop="dictSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改字典对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+
+      <el-form ref="regdictRef" :model="form" :rules="rules" label-width="150px">
+        <el-form-item :label="`${menuname}编码`" prop="dictCode">
+          <el-input v-model="form.dictCode" :placeholder="`请输入${menuname}编码名称`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}名称`" prop="dictName">
+          <el-input v-model="form.dictName" :placeholder="`请输入${menuname}名称`" />
+        </el-form-item>
+
+        <el-form-item label="顺序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+              }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="regdict">
+import { listregdict, addregdict, delregdict, getregdict, updateregdict } from "@/api/regional/dict/regdict.js";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const route = useRoute();
+const regdictList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const menuname = ref("字典");
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 15,
+    dictCode: undefined,
+    dictName: undefined,
+    dictType: undefined,
+    status: undefined
+  },
+  rules: {
+    dictName: [{ required: true, message: menuname.value + "名称不能为空", trigger: "blur" }],
+    dictCode: [{ required: true, message: menuname.value + "编码不能为空", trigger: "blur" }],
+    dictSort: [{ required: true, message: menuname.value + "顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询字典列表 */
+function getList() {
+  loading.value = true;
+  listregdict(queryParams.value).then(response => {
+    regdictList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    dictId: undefined,
+    dictCode: undefined,
+    dictName: undefined,
+    dictType: queryParams.value.dictType,
+    dictSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("regdictRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.dictId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加" + menuname.value;
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const dictId = row.dictId || ids.value;
+  getregdict(dictId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改" + menuname.value;
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["regdictRef"].validate(valid => {
+    if (valid) {
+
+      if (form.value.dictId != undefined) {
+        updateregdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addregdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const dictIds = row.dictId || ids.value;
+  proxy.$modal.confirm('是否确认删除"' + menuname + '"编号为"' + dictIds + '"的数据项？').then(function () {
+    return delregdict(dictIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("system/regdict/export", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
+getTypes(route.query && route.query.dictType, route.query && route.query.typeName);
+/** 查询字典类型详细 */
+function getTypes(dictType, typeName) {
+  queryParams.value.dictType = dictType;
+  menuname.value = typeName;
+  getList();
+}
+</script>
diff --git a/src/views/regional/dict/sampletype/index.vue b/src/views/regional/dict/sampletype/index.vue
new file mode 100644
index 0000000..89b1f33
--- /dev/null
+++ b/src/views/regional/dict/sampletype/index.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/views/regional/inspectionReport/report/index.vue b/src/views/regional/inspectionReport/report/index.vue
new file mode 100644
index 0000000..8a3eb1b
--- /dev/null
+++ b/src/views/regional/inspectionReport/report/index.vue
@@ -0,0 +1,1015 @@
+<template>
+  <div class="app-container">
+    <div ref="compactForm">
+      <el-row :gutter="5" class="compact-form" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryRef" label-width="6.25rem" :rules="queryRules" style="width: 100%;"
+          :size="aotuSize">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="日期：" prop="times">
+                <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="打印状态：" prop="dybz">
+                <el-select v-model="queryParams.dybz" placeholder="请选择" clearable @change="handleQuery">
+                  <el-option label="已打印" value="1" />
+                  <el-option label="未打印" value="0" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="科室：" prop="ksdh">
+                <SelectTable v-model:data="queryParams.ksdh" :fields="ksdhFields" :tableData="dictData.DP || []"
+                  :size="aotuSize" label="label" value="value" objKey="value" :border="true" placeholder="请选择科室"
+                  @getDataValue="handleQuery" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="病人类型：" prop="brlyname">
+                <SelectTable v-model:data="queryParams.brlyname" :fields="brlxFields" :tableData="dictData.PT || []"
+                  :size="aotuSize" label="label" value="label" objKey="label" :border="true" placeholder="请选择科室"
+                  @getDataValue="handleQuery" />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label-width="50px">
+                <el-checkbox v-model="queryParams.alarmflag" label="仅危急值" @change="alarmHandle" :size="aotuSize" />
+                <el-checkbox v-model="queryParams.jzbz" label="仅急诊" @change="jzbzHandle" :size="aotuSize" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="姓名：" prop="brxm">
+                <el-input v-model="queryParams.brxm" clearable placeholder="请输入姓名" @keyup.enter="handleQuery"
+                  @clear="handleQuery" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="病人号：" prop="brdh">
+                <el-input v-model="queryParams.brdh" clearable placeholder="请输入病人号" @keyup.enter="handleQuery"
+                  @clear="handleQuery" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="床号：" prop="ch">
+                <el-input v-model="queryParams.ch" clearable placeholder="请输入床号" @keyup.enter="handleQuery"
+                  @clear="handleQuery" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label-width="50px">
+                <el-button icon="search" type="primary" @click="handleQuery">
+                  搜索
+                </el-button>
+                <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-row>
+    </div>
+    <el-row :gutter="20">
+      <el-col :span="16" class="right-table">
+        <el-row :gutter="10" class="mb8 mt10">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Edit" :size="aotuSize" @click="selectStatusRows">勾选所有未打印</el-button>
+          </el-col>
+          <el-col :span="1.5">
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Upload" :size="aotuSize" @click="printPdf">打印报告</el-button>
+          </el-col>
+
+          <!-- <right-toolbar v-model:showSearch="showSearch" @updateColumns="updateColumns" @queryTable="handleQuery"
+            :columns="columns"></right-toolbar> -->
+        </el-row>
+
+        <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :loading="loading"
+          @selection-change="selectionChange" @row-click="rowHandle" :enableColumnDrag="true"
+          @column-drag-end="handleColumnDragEnd">
+          <template #dybz="{ row }">
+            <svg-icon v-if="row.dybz == 1" icon-class="lvgou" />
+          </template>
+          <template #srcHospName="{ row }">
+            武汉市汉阳区江堤街社区卫生服务中心
+          </template>
+          <template #alarmflag="{ row }">
+            {{ row.alarmflag == 1 ? '危' : '' }}
+          </template>
+          <template #jzbz="{ row }">
+            {{ row.jzbz == 1 ? '急' : '' }}
+          </template>
+        </CustomTable>
+
+      </el-col>
+      <el-col :span="8" class="right-table">
+        <!-- <div class="title">检验结果</div> -->
+        <div class="mb8 mt10">
+          <el-button type="primary" plain :size="aotuSize" @click="openDB">对比历史</el-button>
+          <el-select class="ml10" placeholder="请选择复制" style="width: 140px" @change="copyData" :size="aotuSize">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+          <!-- <el-button type="primary">知识库</el-button> -->
+        </div>
+
+        <CustomTable :data="rightTableData" :columns="rightColumns" :config="rightTableConfig" @row-click="xmrowHandle"
+          ref="rightTableRef">
+          <template #jgbz="{ row }">
+            {{ formatJgbz(row.jgbz) }}
+          </template>
+        </CustomTable>
+
+        <div class="mt10" v-if="bottomTableData.length > 0"></div>
+        <CustomTable v-if="bottomTableData.length > 0" :data="bottomTableData" :columns="bottomColumns"
+          :config="bottomTableConfig">
+        </CustomTable>
+
+        <div v-if="bottomTableData.length > 0" class="expert-comment" :title="expertComment">
+          专家评语：{{ expertComment }}
+        </div>
+      </el-col>
+    </el-row>
+
+    <!-- 样本流程 -->
+    <div class="time-line-box">
+      <div v-for="(item, i) in timelineItems" :key="i" class="time-line-item">
+        <div v-if="i != 0" class="timeline-connector">
+          <img class="timg" src="@/assets/images/yjt.png" alt="">
+        </div>
+        <div :class="['timeline-content', i > lastTimeIndex ? 'no_active' : '']">
+          <div :class="['index', lastTimeIndex == i ? 'active' : '']">{{ Number(i) + 1 }}</div>
+          <div class="timeline-title">{{ item.title }}</div>
+          <div class="timeline-time">{{ item.time }}</div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- 结果对比 -->
+    <el-dialog v-model="dialogVisible" title="结果对比" draggable :close-on-click-modal="false">
+      <div class="flex-between">
+
+      </div>
+      <el-table ref="diaTableRef" :data="compareTableData" style="width: 100%" @row-click="handleRowClick"
+        highlight-current-row border max-height="350px">
+        <el-table-column prop="xmdh" label="项目编号" fixed align="center" width="150px" />
+        <el-table-column prop="xmmc" label="项目名称" fixed align="center" />
+        <template v-for="(period) in periods" :key="period">
+          <el-table-column :label="period" :prop="period" :width="150" align="center" />
+        </template>
+      </el-table>
+
+      <div ref="myEcharts" style="width:100%;height: 350px" />
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { useRouter } from 'vue-router'
+import { reportList, reportPrintPdf, reportResult, reportMedList, reportFsresult } from '@/api/checkCode/index'
+import dayjs from 'dayjs';
+import SelectTable from '@/components/SelectTable/index.vue';
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { classCom } from '@/utils/classCom'
+import * as echarts from 'echarts';
+//@ts-ignore 
+import { comDict } from '@/utils/dict'
+import { usePrintStore } from '@/store/modules/printStore'
+//@ts-ignore 
+import useUserStore from '@/store/modules/user'
+import { useRoute } from 'vue-router'
+
+const aotuSize = classCom.useAutoSize();
+const route = useRoute()
+
+const userStore = useUserStore()
+const compactForm = ref<HTMLElement | null>(null);
+const heightForm = ref(90);
+const dialogVisible = ref(false)
+const tableRefs = ref()
+const diaTableRef = ref()
+const myEcharts = ref()
+const options = ref([
+  { label: '复制全部数据', value: 'All' },
+  { label: '复制异常数据', value: 'N' },
+  { label: '复制正常数据', value: 'Y' },
+])
+interface QueryParams {
+  times: string[]; // 明确类型为字符串元组
+  alarmflag: boolean,
+  jzbz: boolean,
+  ksdh: string,
+  brlyname: string,
+  brxm: string,
+  brdh: string,
+  ch: string,
+  dybz: string,
+  sqh: string,
+  userid: string
+}
+
+// 提交表单数据
+const queryParams = reactive<QueryParams>({
+  times: ['2025-08-19', '2025-08-19'],
+  // ksdh: '0203',
+  ksdh: '0210',
+  brlyname: '',
+  sqh: '25080109476',
+  alarmflag: false,
+  jzbz: false,
+  brxm: '',
+  brdh: '',
+  ch: '',
+  dybz: '',
+  userid: ''
+});
+// 获取当前日期（当天）
+const today = dayjs();
+
+// 计算前6天的日期（当天 + 前6天 = 7天）
+const startOfWeek = today.subtract(6, 'day');
+
+const startDate = route.query.startdate ? String(route.query.startdate) : startOfWeek.format('YYYY-MM-DD');
+const endDate = route.query.endate ? String(route.query.endate) : today.format('YYYY-MM-DD');
+
+// queryParams.times = [startDate, endDate];2025-08-19&endate=2025-08-19
+queryParams.times = ['2025-08-19', '2025-08-19'];
+queryParams.ksdh = (route.query.deptcode as string) || '0210';
+queryParams.userid = (route.query.userid as string) || '00910';
+queryParams.brdh = (route.query.brdh as string) || '';
+
+
+const single = ref(true);
+const multiple = ref(true);
+const alarmflag = ref()
+const jzbz = ref()
+const showSearch = ref(true);
+const queryRef = ref()
+// 项目点击数据
+const Info = ref<any>({})
+// 定义校验规则
+const queryRules = ref({
+  // clientId: [
+  //   { required: true, message: '编号不能为空', trigger: 'blur' },
+
+  // ],
+
+  // failed3: [
+  //   { required: true, message: '条码状态不能为空', trigger: 'change' },
+  // ],
+})
+
+
+// 时间线数据
+const timelineItems = ref(
+  [
+    { title: '检验申请', time: '' },
+    { title: '标本采集', time: '' },
+    { title: '标本送检', time: '' },
+    { title: '标本签收', time: '' },
+    { title: '上机检验', time: '' },
+    { title: '结果审核', time: '' },
+  ]
+);
+
+// 计算最后一个有时间的节点索引
+const lastTimeIndex = computed(() => {
+
+  const lastIndex = timelineItems.value.findLastIndex((item: any) => item.time);
+  if (lastIndex === -1) {
+    return -1
+  } else {
+    return lastIndex;
+  }
+});
+
+const handleQuery = async () => {
+  const valid = await queryRef.value.validate().catch(() => { });
+  if (!valid) return false;
+  getList()
+}
+// 重置
+const resetQuery = () => {
+  queryRef.value?.resetFields();
+  getList()
+}
+
+const loading = ref(false);
+// 勾选框数据
+const rows = ref<any[]>([])
+// 数据源
+const tableData = ref([])
+// 配置项
+const columns = ref([
+  { type: 'selection', visible: true, align: 'center', width: 30, label: '多选框' },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, slot: 'srcHospName', width: 200 },
+  { prop: 'dybz', label: '印', align: 'center', visible: true, slot: 'dybz', width: 40 },
+  { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 40 },
+  { prop: 'alarmflag', label: '危', align: 'center', visible: true, slot: 'alarmflag', width: 40 },
+  { prop: 'brdh', label: '病人代号', align: 'center', visible: true, sortable: true, width: 100 },
+  { prop: 'brxm', label: '病人姓名', align: 'center', visible: true, },
+  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 40 },
+  { prop: 'ch', label: '床号', align: 'center', visible: true, width: 50 },
+  { prop: 'jymd', label: '检验目的', align: 'center', visible: true, width: 200 },
+  { prop: 'yblxname', label: '样本类型', align: 'center', visible: true, },
+  { prop: 'sqsj', label: '送检时间', align: 'center', visible: true, width: 150 },
+  { prop: 'confirmtime', label: '报告时间', align: 'center', visible: true, sortable: true, width: 150 },
+  { prop: 'sjysname', label: '送检医生', align: 'center', visible: true, width: 80 },
+  { prop: 'brlyname', label: '病人类型', align: 'center', visible: true, width: 80 },
+  { prop: 'yljg', label: '医疗机构', align: 'center', visible: true, width: 150 },
+  { prop: 'jyrqname', label: '检验日期', align: 'center', visible: true, width: 100 },
+  { prop: 'ybh', label: '样本号', align: 'center', visible: true, width: 60 },
+  { prop: 'yqmc', label: '仪器名称', align: 'center', visible: true, width: 150 },
+  { prop: 'yqdl', label: '仪器', align: 'center', visible: true, width: 100 },
+  { prop: 'yljg', label: '检验机构', align: 'center', visible: true, width: 150 },
+])
+
+const selectionChange = (selection: any) => {
+  rows.value = selection
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+const rightTableRef = ref()
+const rowHandle = (row: any) => {
+  console.log('row==>', row);
+  if (row.yqdl == '细菌仪') {
+    rightColumns.value[1].visible = false
+    rightColumns.value[2].visible = true
+    rightColumns.value[4].visible = false
+    rightColumns.value[5].visible = false
+    rightColumns.value[6].visible = true
+  } else {
+    rightColumns.value[1].visible = true
+    rightColumns.value[2].visible = false
+    rightColumns.value[4].visible = true
+    rightColumns.value[5].visible = true
+    rightColumns.value[6].visible = false
+  }
+  timelineItems.value =
+    [
+      { title: '检验申请', time: row.sqsj },
+      { title: '标本采集', time: row.cysj },
+      { title: '标本送检', time: row.bbsjsj },
+      { title: '标本签收', time: row.jssj },
+      { title: '上机检验', time: row.sjsj },
+      { title: '结果审核', time: row.confirmtime },
+    ]
+
+  Info.value = row
+  const data = {
+    jyrq: row.jyrq,
+    yq: row.yq,
+    ybh: row.ybh,
+  }
+  reportResult(data).then((res: any) => {
+    if (res.code == 0) {
+      rightTableData.value = res.data
+      nextTick(() => {
+        rightTableRef.value.setCurrentRow(res.data[0])
+      })
+      xmrowHandle(res.data[0])
+    }
+  })
+}
+
+const handleColumnDragEnd = (newColumns: any) => {
+  columns.value = newColumns.columns
+}
+
+// 打印单张Pdf
+const printPdf = () => {
+  const printStore = usePrintStore();
+  const merge = rows.value.map((item: any) => { return `${item.jyrqname.replace(/-/g, '')}_${item.yq.trim()}_${item.ybh}` })
+  // const merge = [
+  //   "20250819_11_1",
+  //   "20250819_11_10",
+  //   "20250819_11_11"
+  // ]
+  reportPrintPdf(merge).then((res: any) => {
+    if (res.code == 0) {
+      if (!res.data) return ElMessage.warning('未找到打印文件')
+      classCom.printBase64PDF(res.data)
+      // if (printStore.isConnected) {
+      //   HiprintPrinter.silentPrint([res.data])
+      // } else {
+      //    classCom.printBase64PDF(res.data)
+      // }
+    }
+  })
+}
+
+// 单元格样式
+const cellStyleHd = ({ row, column, rowIndex, columnIndex }: {
+  row: any;
+  column: any;
+  rowIndex: number;
+  columnIndex: number;
+}) => {
+  // console.log(row, column, rowIndex, columnIndex);
+  if (column.label == "急" && row.jzbz == "1") {
+    return { color: '#f00' };
+  }
+  if (column.label == "危" && row.alarmflag == "1") {
+    return { color: '#f00' };
+  }
+};
+
+// 表格配置
+const tableConfig = ref(
+  {
+    // stripe: true, // 斑马纹
+    border: true, // 边框
+    height: '', // 高度
+    highlightCurrentRow: true, // 高亮当前行
+    fit: true,
+    cellStyle: cellStyleHd
+  }
+)
+
+// 勾选未打印
+const selectStatusRows = () => {
+  tableRefs.value.clearSelection()
+  tableData.value.forEach((item: any) => {
+    if (item.dybz != 1) {
+      tableRefs.value.toggleRowSelection(item, true)
+    }
+  })
+}
+const alarmHandle = (val: boolean) => {
+  if (val) {
+    queryParams.jzbz = false
+    alarmflag.value = '1'
+    jzbz.value = null
+  } else {
+    alarmflag.value = null
+  }
+  getList()
+}
+const jzbzHandle = (val: boolean) => {
+  if (val) {
+    queryParams.alarmflag = false
+    alarmflag.value = null
+    jzbz.value = '1'
+  } else {
+    jzbz.value = null
+  }
+  getList()
+}
+
+
+interface ColumnItem {
+  prop: string;
+  label: string;
+  visible: boolean;
+  key: number;
+  align?: string;
+  slot?: string;
+  width?: string | number;
+  sortable?: boolean;
+  type?: string;
+}
+// 更新列
+const updateColumns = (arr: any[]) => {
+  columns.value = arr
+};
+
+const ksdhFields = ref([
+  { prop: 'value', label: '代号', width: 80, enablePinyinSearch: true },
+  { prop: 'label', label: '名称', enablePinyinSearch: true },
+])
+
+const brlxFields = ref([
+  { prop: 'value', label: '代号', width: 80, enablePinyinSearch: true },
+  { prop: 'label', label: '名称', enablePinyinSearch: true },
+])
+
+
+
+// 右侧数据源
+const rightTableData = ref([])
+// 配置项
+const rightColumns = ref([
+  { prop: 'xmdh', label: '项目代号', align: 'center', visible: true, },
+  { prop: 'xmmc', label: '项目名称', align: 'center', visible: true, },
+  { prop: 'xmmc', label: '培养结果', align: 'center', visible: true, width: 150 },
+  { prop: 'csjg', label: '检验结果', align: 'center', visible: true, },
+  { prop: 'refs', label: '参考值', align: 'center', visible: true, },
+  { prop: 'dw', label: '单位', align: 'center', visible: true, },
+  { prop: 'od', label: '菌落计数', align: 'center', visible: true, },
+  { prop: 'jgbz', label: '结果标志', align: 'center', visible: true, slot: 'jgbz' },
+])
+
+const rightCellStyleHd = ({ row, column, rowIndex, columnIndex }: {
+  row: any;
+  column: any;
+  rowIndex: number;
+  columnIndex: number;
+}) => {
+  if (column.label == "检验结果" && (row.alarm_flag ?? "").trim().length > 0) {
+    return { background: '#f00  !important', color: '#FFF' };
+  }
+
+  if (column.label == "检验结果" && row.jgbz == "H") {
+    return { background: '#ffc0c0  !important', color: '#606266' };
+  }
+  if (column.label == "检验结果" && row.jgbz == "L") {
+    return { background: '#8080ff  !important', color: '#fff' };
+  }
+  if (column.label == "检验结果" && row.jgbz == "P") {
+    return { background: '#ffc0c0  !important', color: '#606266' };
+  }
+  if (column.label == "检验结果" && row.jgbz == "Q") {
+    return { background: '#ffff80  !important', color: '#606266' };
+  }
+};
+// 表格配置
+const rightTableConfig = ref(
+  {
+    // stripe: true, // 斑马纹
+    border: true, // 边框
+    height: '25vh', // 高度
+    highlightCurrentRow: true, // 高亮当前行
+    cellStyle: rightCellStyleHd
+  }
+)
+
+const formatJgbz = (v: string) => {
+  const jgbzMap = {
+    'H': '高',
+    'L': '低',
+    'N': '阴性',
+    'P': '阳性',
+    'Q': '弱阳性',
+    'M': '正常'
+  };
+  return jgbzMap[v as keyof typeof jgbzMap] ?? '';
+}
+
+const expertComment = ref('')
+const xmRow = ref<any>({})
+// 查询抗生素
+const xmrowHandle = (row: any) => {
+  xmRow.value = row
+  expertComment.value = row.textresult
+  const data = {
+    jyrq: Info.value.jyrq,
+    yq: Info.value.yq,
+    ybh: Info.value.ybh,
+    xmdh: row.xmdh
+  }
+  reportMedList(data).then((res: any) => {
+    if (res.code == 200) {
+      bottomTableData.value = res.rows
+      if (res.rows.length > 0) {
+        nextTick(() => {
+          rightTableConfig.value.height = `calc(32vh - ${heightForm.value}px)`
+          rightTableRef.value?.doLayout && rightTableRef.value.doLayout();
+        });
+      } else {
+        nextTick(() => {
+          rightTableConfig.value.height = `calc(74vh - ${heightForm.value}px)`
+          rightTableRef.value?.doLayout && rightTableRef.value.doLayout();
+        });
+      }
+    }
+  })
+}
+
+const periods = ref<string[]>([])
+
+const compareTableData = ref([])
+
+
+// 历史数据对比
+const openDB = () => {
+  // 00507620
+  compareTableData.value = []
+  if (!xmRow.value.xmdh) return ElMessage.error('至少选择一条数据进行对比')
+  const data = {
+    brdh: Info.value.brdh,
+    xmdh: xmRow.value.xmdh
+  }
+  reportFsresult(data).then((res: any) => {
+    periods.value = []
+    if (res.code == 0) {
+      const arr: string[] = res.data.map((item: any) => item.confirmdt);
+      periods.value = [...new Set(arr)];
+      res.data.forEach((v: any) => {
+        arr.forEach((item: any) => {
+          if (item == v.confirmdt) {
+            v[item] = v.csjg
+          }
+        })
+      });
+
+      // @ts-ignore  忽略重组数据动态时间key
+      compareTableData.value = formatGroupedData(res.data)
+      dialogVisible.value = true
+      nextTick(() => {
+        diaTableRef.value.setCurrentRow(compareTableData.value[0])
+        handleRowClick(compareTableData.value[0])
+      })
+    }
+  })
+}
+
+
+interface copyItem {
+  xmdh: string;
+  xmmc: string;
+  csjg: string | number;
+  refs: string | number;
+  dw: string;
+  jgbz: string;
+}
+// 复制函数
+const copyData = (type: string) => {
+  let str = ''
+  const getCommonRow = (item: copyItem) => `${item.xmdh}\t${item.xmmc}\t${item.csjg}\t${item.refs}\t${item.dw}\t${item.jgbz}\t\r\n`;
+  rightTableData.value.forEach((v: any) => {
+    if (type == 'All') {
+      str = str + getCommonRow(v)
+      // str = str + v.xmmc + v.csjg + v.dw + + ',';
+    }
+    if (type == 'N' && v.jgbz != 'M' && v.jgbz != '') {
+      str = str + getCommonRow(v)
+    }
+    if (type == 'Y' && v.jgbz == 'M' && v.jgbz != '') {
+      str = str + getCommonRow(v)
+    }
+  })
+
+  var input = document.createElement('textarea');
+  if (!str) return ElMessage.error('没有数据可复制');
+  // 把文字放进input中，供复制
+  input.value = str;
+  document.body.appendChild(input);
+  // 选中创建的input
+  input.select();
+  var copy_result = document.execCommand('copy');
+  if (copy_result) {
+    ElMessage.success('复制成功');
+  } else {
+    ElMessage.error('复制失败');
+  }
+  // 移除
+  document.body.removeChild(input);
+}
+
+// 数据重组
+const formatGroupedData = (data: any[]) => {
+  if (!data || data.length === 0) return [];
+
+  const groupMap: any = {};
+  data.forEach(item => {
+    const key = item.xmdh;
+    if (!groupMap[key]) {
+      groupMap[key] = {
+        xmdh: item.xmdh,
+        xmmc: item.xmmc,
+        // confirmdt: item.confirmdt
+      };
+    }
+    const dateKeys = Object.keys(item).filter(key =>
+      /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(key) // 匹配 YYYY-MM-DD HH:mm:ss 时间格式
+    );
+    // 将日期键值对添加到分组对象
+    dateKeys.forEach(dateKey => {
+      groupMap[key][dateKey] = item[dateKey];
+    });
+  });
+  // 将 Map 转为数组
+  return Object.values(groupMap);
+};
+
+const handleRowClick = (row: any) => {
+  getEcharts(row)
+}
+
+const getEcharts = (data: any) => {
+  const dateKeys = Object.keys(data).filter(key =>
+    /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(key)
+  );
+  const Intance = echarts.init(myEcharts.value);
+  const xData = dateKeys;
+  let seriesData = []
+  seriesData = dateKeys.map(item => data[item]);
+
+  const option = {
+    title: {
+      text: data.xmmc,
+      top: '5',
+      right: '5%',
+      left: '20',
+      // bottom: '20%'
+      // subtext: 'Feature Sample: Gradient Color, Shadow, Click Zoom'
+    },
+    tooltip: {
+      trigger: 'axis'
+    },
+    grid: {
+      top: '20%',
+      left: '3%',
+      right: '4%',
+      // bottom: '3%',
+      height: '80%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      data: xData,
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        lineStyle: {
+          // color: 'rgba(193, 207, 220, 1)',
+        }
+      },
+      axisLabel: {
+        rotate: 30,
+        textStyle: {
+          color: "#8D949B "
+        }
+      },
+    },
+    yAxis: [{
+      // name: '单位(mm)',
+      type: 'value',
+      axisLabel: {
+        textStyle: {
+          color: "#8D949B"
+        },
+        // formatter: '{value}%'
+
+
+      },
+      axisLine: {
+        show: false,
+        lineStyle: {
+          color: '#24abf2'
+        }
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: 'dashed'
+        },
+      },
+    }
+    ],
+    series: [{
+      name: data.xmmc,
+      type: 'line',
+      data: seriesData,
+      symbol: 'circle',
+      symbolSize: 5, //标记的大小
+      lineStyle: {
+        normal: {
+          width: 2,
+          color: '#24abf2',
+        }
+      },
+      itemStyle: {
+        normal: {
+          color: '#24abf2',
+        }
+      },
+      smooth: true
+    }
+    ]
+  };
+
+  Intance.setOption(option);
+}
+
+// 右侧数据源
+const bottomTableData = ref([])
+// 配置项
+const bottomColumns = ref([
+  { prop: 'ywdh', label: '抗生素代码', align: 'center', visible: true, },
+  { prop: 'ywmc', label: '抗生素名称', align: 'center', width: 200, visible: true, },
+  { prop: 'mic', label: 'MIC', align: 'center', visible: true },
+  { prop: 'rad', label: 'KB', align: 'center', visible: true },
+  { prop: 'csjg', label: '药敏结果', align: 'center', visible: true },
+])
+const botCellStyleHd = ({ row, column, rowIndex, columnIndex }: {
+  row: any;
+  column: any;
+  rowIndex: number;
+  columnIndex: number;
+}) => {
+  if (column.label == '药敏结果' && row.jgbz == 'R') {
+    return { background: '#ffc0c0  !important', color: '#606266' };
+  }
+  if (column.label == '药敏结果' && row.jgbz.trim() == "") {
+    return { background: '#ffff80  !important', color: '#606266' };
+  }
+}
+// 表格配置
+const bottomTableConfig = ref(
+  {
+    // stripe: true, // 斑马纹
+    border: true, // 边框
+    height: '35vh', // 高度
+    highlightCurrentRow: true, // 高亮当前行
+    cellStyle: botCellStyleHd
+  }
+)
+interface DictData {
+  DP?: Array<any>;
+  PT?: Array<any>;
+  [key: string]: any[] | undefined; // 添加索引签名以支持动态访问
+}
+
+
+// 字典数据存储
+const dictData = ref<DictData>({});
+
+onMounted(async () => {
+  // 初始化3天区间（今天-前两天）
+  // const end = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  // const start = dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'); //add 时间往后
+  // queryParams.times = [start, end];
+  // console.log(queryParams.times);
+  // 进入页面单点登录
+  userStore.loginAnonymous({ name: 'admin' })
+  getList()
+  adjustTableHeight();
+
+  // 加载病人来源字典
+  const dictRefs = await comDict('PT', 'DP');
+
+  // 从 ref 中获取实际数据
+  dictData.value = {
+    PT: toRaw(dictRefs.PT.value) || [],
+    DP: toRaw(dictRefs.DP.value) || [],
+  };
+});
+
+
+const getList = () => {
+  if (!queryParams.ksdh) return ElMessage.error('科室代号不能为空');
+  if (!queryParams.userid) return ElMessage.error('用户userid不能为空');
+  const data = {
+    alarmflag: alarmflag.value,
+    jzbz: jzbz.value,
+    dybz: queryParams.dybz,
+    ksdh: queryParams.ksdh,
+    brlyname: queryParams.brlyname,
+    brxm: queryParams.brxm,
+    brdh: queryParams.brdh,
+    ch: queryParams.ch,
+    userid: queryParams.userid,
+    st: '',
+    et: '',
+    yljg: 1,
+
+  }
+  if (queryParams.times && queryParams.times.length) {
+    data.st = queryParams.times[0]
+    data.et = queryParams.times[1]
+  } else {
+    return ElMessage.error('日期时间段不能为空');
+  }
+  loading.value = true
+  reportList(data).then((res: any) => {
+    if (res.code == 0) {
+      loading.value = false
+      tableData.value = res.data
+      if (res.data.length > 0) {
+        tableRefs.value.setCurrentRow(res.data[0])
+        rowHandle(res.data[0])
+      } else {
+        rightTableData.value = []
+        bottomTableData.value = []
+      }
+    }
+  })
+}
+
+// 计算table高度
+watch(showSearch, () => {
+  nextTick(() => {
+    adjustTableHeight();
+  })
+}, { immediate: true });
+
+function adjustTableHeight() {
+  if (compactForm.value) {
+    heightForm.value = compactForm.value.offsetHeight;
+
+    nextTick(() => {
+      tableConfig.value.height = `calc(74vh - ${heightForm.value}px)`
+      tableRefs.value?.doLayout && tableRefs.value.doLayout();
+    });
+
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  border-bottom: 1px solid #E1E9F7;
+
+  .el-form-item {
+    margin-bottom: .3125rem;
+  }
+}
+
+.title {
+  border-bottom: 1px solid #E1E9F7;
+  margin-bottom: .625rem;
+  padding: .625rem;
+  font-weight: 700;
+}
+
+
+.time-line-box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin-top: .35rem;
+  background-color: #f0f3f8;
+  padding: .3rem 2.5rem;
+}
+
+.time-line-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 16.6%;
+  // padding: 0 30px;
+
+  .timeline-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .index {
+      width: 1.875rem;
+      height: 1.875rem;
+      line-height: 1.875rem;
+      background: #E1E9F7;
+      border-radius: 50%;
+      text-align: center;
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 500;
+      font-size: 1.125rem;
+      color: #4767A3;
+    }
+
+    .active {
+      background-color: #4096ff;
+      box-shadow: 0 0 0 .25rem rgba(64, 150, 255, 0.2);
+      color: #FFF;
+    }
+
+    .timeline-title {
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 500;
+      font-size: 1rem;
+      color: #4767A3;
+    }
+
+    .timeline-time {
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-weight: 400;
+      font-size: .875rem;
+      color: #4767A3;
+    }
+
+  }
+
+  .timg {
+    width: 3.125rem;
+  }
+}
+
+:deep(.el-form-item--default) {
+  margin-bottom: 1.125rem;
+}
+
+.expert-comment {
+  /* 限制最大显示行数为2行 */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  /* 超出部分隐藏 */
+  overflow: hidden;
+  /* 可选：设置行高和最大宽度，优化显示效果 */
+  line-height: 1.5;
+  /* 行高，根据字体大小调整 */
+  max-width: 100%;
+  pointer-events: auto;
+  /* 允许鼠标交互 */
+  cursor: default;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/regConfig/index.vue b/src/views/regional/regConfig/index.vue
new file mode 100644
index 0000000..3f5be97
--- /dev/null
+++ b/src/views/regional/regConfig/index.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="参数代号" prop="dictCode">
+        <el-input v-model="queryParams.dictCode" placeholder="请输入" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="参数名称" prop="dictName">
+        <el-input v-model="queryParams.dictName" placeholder="请输入" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="参数代号" align="center" prop="dictCode" />
+      <el-table-column label="参数名称" align="center" prop="dictName" />
+      <el-table-column label="参数值" align="center" prop="remark" />
+      <el-table-column label="排序" align="center" prop="dictSort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改字典对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+
+      <el-form ref="regdictRef" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="参数代号" prop="dictCode">
+          <el-input v-model="form.dictCode" placeholder="请输入参数代号" />
+        </el-form-item>
+        <el-form-item label="参数名称" prop="dictName">
+          <el-input v-model="form.dictName" placeholder="请输入参数名称" />
+        </el-form-item>
+
+        <el-form-item label="顺序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="参数值" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="regdict">
+import { listregdict, addregdict, delregdict, getregdict, updateregdict } from "@/api/regional/dict/regdict.js";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const route = useRoute();
+const regdictList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const menuname = ref("字典");
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 15,
+    dictCode: undefined,
+    dictName: undefined,
+    dictType: undefined,
+    status: undefined
+  },
+  rules: {
+    dictName: [{ required: true, message: "参数名称不能为空", trigger: "blur" }],
+    dictCode: [{ required: true, message: "参数代号不能为空", trigger: "blur" }],
+    dictSort: [{ required: true, message: "顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询字典列表 */
+function getList() {
+  loading.value = true;
+  listregdict(queryParams.value).then(response => {
+    regdictList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    dictId: undefined,
+    dictCode: undefined,
+    dictName: undefined,
+    dictType: queryParams.value.dictType,
+    dictSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("regdictRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.dictId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加参数"
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const dictId = row.dictId || ids.value;
+  getregdict(dictId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改参数"
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["regdictRef"].validate(valid => {
+    if (valid) {
+
+      if (form.value.dictId != undefined) {
+        updateregdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addregdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const dictIds = row.dictId || ids.value;
+  proxy.$modal.confirm('是否确认删除参数编号为' + dictIds + '"的数据项？').then(function () {
+    return delregdict(dictIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("system/regdict/export", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
+getTypes(route.query && route.query.dictType, route.query && route.query.typeName);
+/** 查询字典类型详细 */
+function getTypes(dictType, typeName) {
+  queryParams.value.dictType = dictType;
+  menuname.value = typeName;
+  getList();
+}
+</script>
diff --git a/src/views/regional/statistics/bbtj/index.vue b/src/views/regional/statistics/bbtj/index.vue
new file mode 100644
index 0000000..7de86a5
--- /dev/null
+++ b/src/views/regional/statistics/bbtj/index.vue
@@ -0,0 +1,223 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="mb10">
+      <el-button type="primary" @click="thHandle(20)">重新采集</el-button>
+      <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
+      <el-button type="primary" @click="thHandle(90)">申请作废</el-button>
+
+    </div>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { querySampleSignBack, sampleSign } from '@/api/regional/index'
+import SelectTable from '@/components/SelectTable/index.vue';
+import { classCom } from '@/utils/classCom';
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import { ElMessage } from 'element-plus';
+const aotuSize = classCom.useAutoSize();
+
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1,
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { type: 'selection', align: 'center', visible: true, width: 40 },
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 60 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '检测机构', align: 'center', visible: true, width: 200 },
+  { prop: 'Status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  { prop: 'backReasons', label: '退回理由', align: 'center', visible: true, width: 150 },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'backUserName', label: '操作人', align: 'center', visible: true, },
+  { prop: 'backTime', label: '操作时间', align: 'center', visible: true, width: 150 },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  // fit: true, // 列宽自适应
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+const barcodes = ref([])
+const tableRefs = ref(null)
+
+const thHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  sampleSign({ status: val, barcode: barcodes.value }).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      handleQuery()
+    }
+  })
+}
+const handleSelectionChange = (val: any) => {
+  barcodes.value = val.map((item: any) => item.barcode)
+}
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+  }
+  handleQuery()
+}
+const getList = () => {
+  querySampleSignBack(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  getList()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+
+.btns {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  &>button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/statistics/fytj/index.vue b/src/views/regional/statistics/fytj/index.vue
new file mode 100644
index 0000000..1743dd9
--- /dev/null
+++ b/src/views/regional/statistics/fytj/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <div class="compact-form">
+      <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
+        <el-row :gutter="10">
+          <el-col :span="5">
+            <el-form-item label="就诊医院：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
+              <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="5">
+            <el-form-item label="日期：" prop="times">
+              <el-date-picker v-model="queryParams.times" type="daterange" range-separator="-" start-placeholder="开始时间"
+                end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <div class="mb10">
+      <!-- <el-button type="primary" @click="thHandle(20)">重新采集</el-button>
+      <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
+      <el-button type="primary" @click="thHandle(90)">申请作废</el-button> -->
+    </div>
+    <div style="height: calc(100% - 100px);">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange">
+
+      </CustomTable>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import CustomTable from '@/components/elTable/index.vue'
+import { sampleitemCount, sampleSign } from '@/api/regional/index'
+import SelectTable from '@/components/SelectTable/index.vue';
+import { classCom } from '@/utils/classCom';
+// @ts-ignore
+import { listhospital } from "@/api/regional/dict/hospital.js";
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import { ElMessage } from 'element-plus';
+const aotuSize = classCom.useAutoSize();
+import dayjs from 'dayjs';
+const today = dayjs().format('YYYY-MM-DD');
+const queryParams: any = ref({
+  pageSize: 50,
+  pageNum: 1,
+  times: [today, today]
+})
+const tableData: any = ref([])
+const columns: any = ref([
+  { prop: 'SrcHospName', label: '就诊医院', align: 'center', visible: true, },
+  { prop: 'SrcOrderItemCode', label: '组合编码', align: 'center', visible: true, },
+  { prop: 'SrcOrderItemName', label: '组合名称', align: 'center', visible: true, },
+  { prop: 'sl', label: '数量(份)', align: 'center', visible: true, },
+  { prop: 'cost', label: '费用', align: 'center', visible: true, },
+  { prop: 'DstHospName', label: '检测医院', align: 'center', visible: true, },
+])
+const tableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  summary: true,
+  summaryField: ['sl', 'cost'],//计算列总和
+  sumText: '合计'
+})
+
+const pagination = ref({
+  show: true,
+  total: 0,
+  pageSize: 50,
+  currentPage: 1,
+})
+
+const ksdhFields = ref([
+  { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
+  { prop: 'value', label: '代号', width: 120, enablePinyinSearch: true },
+])
+const barcodes = ref([])
+const tableRefs = ref(null)
+
+const thHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  sampleSign({ status: val, barcode: barcodes.value }).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      handleQuery()
+    }
+  })
+}
+const handleSelectionChange = (val: any) => {
+  barcodes.value = val.map((item: any) => item.barcode)
+}
+const currentChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageNum = page.currentPage
+  handleQuery()
+}
+const sizeChange = (page: { currentPage: number, pageSize: number }) => {
+  queryParams.value.pageSize = page.pageSize
+  handleQuery()
+}
+
+
+const handleQuery = () => {
+  if (queryParams.value.times && queryParams.value.times.length > 0) {
+    queryParams.value.DateStart = queryParams.value.times[0]
+    queryParams.value.DateEnd = queryParams.value.times[1]
+  } else {
+    queryParams.value.DateStart = ''
+    queryParams.value.DateEnd = ''
+  }
+
+  getList()
+}
+
+const resetHandle = () => {
+  queryParams.value = {
+    pageSize: 50,
+    pageNum: 1,
+    times: [today, today]
+  }
+  handleQuery()
+}
+const getList = () => {
+  sampleitemCount(queryParams.value).then((res: any) => {
+    tableData.value = res.rows
+    pagination.value.total = res.total
+  })
+}
+const hosList = ref([])
+const regdictList: any = ref([])
+onMounted(() => {
+  handleQuery()
+  listhospital().then((res: any) => {
+    hosList.value = res.rows.map((item: any) => {
+      return {
+        label: item.hospitalName,
+        value: item.hospitalCode
+      }
+    })
+  })
+
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
+  })
+})
+
+const formatDict = (v: string, arr: Array<any>) => {
+  return arr.find((item: any) => item.dictCode == v)?.dictName || v;
+};
+</script>
+
+<style scoped lang="scss">
+.compact-form {
+  height: 2.5rem;
+
+  .el-form-item {
+    margin-bottom: 5px;
+  }
+}
+
+.btns {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  &>button {
+    width: 100%;
+    margin-left: 0;
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/regional/statistics/overview/css/icon.css b/src/views/regional/statistics/overview/css/icon.css
new file mode 100644
index 0000000..eac9f45
--- /dev/null
+++ b/src/views/regional/statistics/overview/css/icon.css
@@ -0,0 +1,1225 @@
+@keyframes cuIcon-spin {
+	0% {
+		-webkit-transform: rotate(0);
+		transform: rotate(0);
+	}
+
+	100% {
+		-webkit-transform: rotate(359deg);
+		transform: rotate(359deg);
+	}
+}
+
+.iconfont-spin {
+	-webkit-animation: cuIcon-spin 2s infinite linear;
+	animation: cuIcon-spin 2s infinite linear;
+	display: inline-block;
+}
+
+.iconfont-pulse {
+	-webkit-animation: cuIcon-spin 1s infinite steps(8);
+	animation: cuIcon-spin 1s infinite steps(8);
+	display: inline-block;
+}
+
+[class*="cuIcon-"] {
+	font-family: "cuIcon";
+	font-size: inherit;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: "cuIcon";
+	src: url('//at.alicdn.com/t/font_533566_yfq2d9wdij.eot?t=1545239985831');
+	/* IE9*/
+	src: url('//at.alicdn.com/t/font_533566_yfq2d9wdij.eot?t=1545239985831#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+		url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
+		url('//at.alicdn.com/t/font_533566_yfq2d9wdij.ttf?t=1545239985831') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+		url('//at.alicdn.com/t/font_533566_yfq2d9wdij.svg?t=1545239985831#iconfont') format('svg');
+	/* iOS 4.1- */
+}
+
+.cuIcon-appreciate:before {
+	content: "\e644";
+}
+
+.cuIcon-check:before {
+	content: "\e645";
+}
+
+.cuIcon-close:before {
+	content: "\e646";
+}
+
+.cuIcon-edit:before {
+	content: "\e649";
+}
+
+.cuIcon-emoji:before {
+	content: "\e64a";
+}
+
+.cuIcon-favorfill:before {
+	content: "\e64b";
+}
+
+.cuIcon-favor:before {
+	content: "\e64c";
+}
+
+.cuIcon-loading:before {
+	content: "\e64f";
+}
+
+.cuIcon-locationfill:before {
+	content: "\e650";
+}
+
+.cuIcon-location:before {
+	content: "\e651";
+}
+
+.cuIcon-phone:before {
+	content: "\e652";
+}
+
+.cuIcon-roundcheckfill:before {
+	content: "\e656";
+}
+
+.cuIcon-roundcheck:before {
+	content: "\e657";
+}
+
+.cuIcon-roundclosefill:before {
+	content: "\e658";
+}
+
+.cuIcon-roundclose:before {
+	content: "\e659";
+}
+
+.cuIcon-roundrightfill:before {
+	content: "\e65a";
+}
+
+.cuIcon-roundright:before {
+	content: "\e65b";
+}
+
+.cuIcon-search:before {
+	content: "\e65c";
+}
+
+.cuIcon-taxi:before {
+	content: "\e65d";
+}
+
+.cuIcon-timefill:before {
+	content: "\e65e";
+}
+
+.cuIcon-time:before {
+	content: "\e65f";
+}
+
+.cuIcon-unfold:before {
+	content: "\e661";
+}
+
+.cuIcon-warnfill:before {
+	content: "\e662";
+}
+
+.cuIcon-warn:before {
+	content: "\e663";
+}
+
+.cuIcon-camerafill:before {
+	content: "\e664";
+}
+
+.cuIcon-camera:before {
+	content: "\e665";
+}
+
+.cuIcon-commentfill:before {
+	content: "\e666";
+}
+
+.cuIcon-comment:before {
+	content: "\e667";
+}
+
+.cuIcon-likefill:before {
+	content: "\e668";
+}
+
+.cuIcon-like:before {
+	content: "\e669";
+}
+
+.cuIcon-notificationfill:before {
+	content: "\e66a";
+}
+
+.cuIcon-notification:before {
+	content: "\e66b";
+}
+
+.cuIcon-order:before {
+	content: "\e66c";
+}
+
+.cuIcon-samefill:before {
+	content: "\e66d";
+}
+
+.cuIcon-same:before {
+	content: "\e66e";
+}
+
+.cuIcon-deliver:before {
+	content: "\e671";
+}
+
+.cuIcon-evaluate:before {
+	content: "\e672";
+}
+
+.cuIcon-pay:before {
+	content: "\e673";
+}
+
+.cuIcon-send:before {
+	content: "\e675";
+}
+
+.cuIcon-shop:before {
+	content: "\e676";
+}
+
+.cuIcon-ticket:before {
+	content: "\e677";
+}
+
+.cuIcon-back:before {
+	content: "\e679";
+}
+
+.cuIcon-cascades:before {
+	content: "\e67c";
+}
+
+.cuIcon-discover:before {
+	content: "\e67e";
+}
+
+.cuIcon-list:before {
+	content: "\e682";
+}
+
+.cuIcon-more:before {
+	content: "\e684";
+}
+
+.cuIcon-scan:before {
+	content: "\e689";
+}
+
+.cuIcon-settings:before {
+	content: "\e68a";
+}
+
+.cuIcon-questionfill:before {
+	content: "\e690";
+}
+
+.cuIcon-question:before {
+	content: "\e691";
+}
+
+.cuIcon-shopfill:before {
+	content: "\e697";
+}
+
+.cuIcon-form:before {
+	content: "\e699";
+}
+
+.cuIcon-pic:before {
+	content: "\e69b";
+}
+
+.cuIcon-filter:before {
+	content: "\e69c";
+}
+
+.cuIcon-footprint:before {
+	content: "\e69d";
+}
+
+.cuIcon-top:before {
+	content: "\e69e";
+}
+
+.cuIcon-pulldown:before {
+	content: "\e69f";
+}
+
+.cuIcon-pullup:before {
+	content: "\e6a0";
+}
+
+.cuIcon-right:before {
+	content: "\e6a3";
+}
+
+.cuIcon-refresh:before {
+	content: "\e6a4";
+}
+
+.cuIcon-moreandroid:before {
+	content: "\e6a5";
+}
+
+.cuIcon-deletefill:before {
+	content: "\e6a6";
+}
+
+.cuIcon-refund:before {
+	content: "\e6ac";
+}
+
+.cuIcon-cart:before {
+	content: "\e6af";
+}
+
+.cuIcon-qrcode:before {
+	content: "\e6b0";
+}
+
+.cuIcon-remind:before {
+	content: "\e6b2";
+}
+
+.cuIcon-delete:before {
+	content: "\e6b4";
+}
+
+.cuIcon-profile:before {
+	content: "\e6b7";
+}
+
+.cuIcon-home:before {
+	content: "\e6b8";
+}
+
+.cuIcon-cartfill:before {
+	content: "\e6b9";
+}
+
+.cuIcon-discoverfill:before {
+	content: "\e6ba";
+}
+
+.cuIcon-homefill:before {
+	content: "\e6bb";
+}
+
+.cuIcon-message:before {
+	content: "\e6bc";
+}
+
+.cuIcon-addressbook:before {
+	content: "\e6bd";
+}
+
+.cuIcon-link:before {
+	content: "\e6bf";
+}
+
+.cuIcon-lock:before {
+	content: "\e6c0";
+}
+
+.cuIcon-unlock:before {
+	content: "\e6c2";
+}
+
+.cuIcon-vip:before {
+	content: "\e6c3";
+}
+
+.cuIcon-weibo:before {
+	content: "\e6c4";
+}
+
+.cuIcon-activity:before {
+	content: "\e6c5";
+}
+
+.cuIcon-friendaddfill:before {
+	content: "\e6c9";
+}
+
+.cuIcon-friendadd:before {
+	content: "\e6ca";
+}
+
+.cuIcon-friendfamous:before {
+	content: "\e6cb";
+}
+
+.cuIcon-friend:before {
+	content: "\e6cc";
+}
+
+.cuIcon-goods:before {
+	content: "\e6cd";
+}
+
+.cuIcon-selection:before {
+	content: "\e6ce";
+}
+
+.cuIcon-explore:before {
+	content: "\e6d2";
+}
+
+.cuIcon-present:before {
+	content: "\e6d3";
+}
+
+.cuIcon-squarecheckfill:before {
+	content: "\e6d4";
+}
+
+.cuIcon-square:before {
+	content: "\e6d5";
+}
+
+.cuIcon-squarecheck:before {
+	content: "\e6d6";
+}
+
+.cuIcon-round:before {
+	content: "\e6d7";
+}
+
+.cuIcon-roundaddfill:before {
+	content: "\e6d8";
+}
+
+.cuIcon-roundadd:before {
+	content: "\e6d9";
+}
+
+.cuIcon-add:before {
+	content: "\e6da";
+}
+
+.cuIcon-notificationforbidfill:before {
+	content: "\e6db";
+}
+
+.cuIcon-explorefill:before {
+	content: "\e6dd";
+}
+
+.cuIcon-fold:before {
+	content: "\e6de";
+}
+
+.cuIcon-game:before {
+	content: "\e6df";
+}
+
+.cuIcon-redpacket:before {
+	content: "\e6e0";
+}
+
+.cuIcon-selectionfill:before {
+	content: "\e6e1";
+}
+
+.cuIcon-similar:before {
+	content: "\e6e2";
+}
+
+.cuIcon-appreciatefill:before {
+	content: "\e6e3";
+}
+
+.cuIcon-infofill:before {
+	content: "\e6e4";
+}
+
+.cuIcon-info:before {
+	content: "\e6e5";
+}
+
+.cuIcon-forwardfill:before {
+	content: "\e6ea";
+}
+
+.cuIcon-forward:before {
+	content: "\e6eb";
+}
+
+.cuIcon-rechargefill:before {
+	content: "\e6ec";
+}
+
+.cuIcon-recharge:before {
+	content: "\e6ed";
+}
+
+.cuIcon-vipcard:before {
+	content: "\e6ee";
+}
+
+.cuIcon-voice:before {
+	content: "\e6ef";
+}
+
+.cuIcon-voicefill:before {
+	content: "\e6f0";
+}
+
+.cuIcon-friendfavor:before {
+	content: "\e6f1";
+}
+
+.cuIcon-wifi:before {
+	content: "\e6f2";
+}
+
+.cuIcon-share:before {
+	content: "\e6f3";
+}
+
+.cuIcon-wefill:before {
+	content: "\e6f4";
+}
+
+.cuIcon-we:before {
+	content: "\e6f5";
+}
+
+.cuIcon-lightauto:before {
+	content: "\e6f6";
+}
+
+.cuIcon-lightforbid:before {
+	content: "\e6f7";
+}
+
+.cuIcon-lightfill:before {
+	content: "\e6f8";
+}
+
+.cuIcon-camerarotate:before {
+	content: "\e6f9";
+}
+
+.cuIcon-light:before {
+	content: "\e6fa";
+}
+
+.cuIcon-barcode:before {
+	content: "\e6fb";
+}
+
+.cuIcon-flashlightclose:before {
+	content: "\e6fc";
+}
+
+.cuIcon-flashlightopen:before {
+	content: "\e6fd";
+}
+
+.cuIcon-searchlist:before {
+	content: "\e6fe";
+}
+
+.cuIcon-service:before {
+	content: "\e6ff";
+}
+
+.cuIcon-sort:before {
+	content: "\e700";
+}
+
+.cuIcon-down:before {
+	content: "\e703";
+}
+
+.cuIcon-mobile:before {
+	content: "\e704";
+}
+
+.cuIcon-mobilefill:before {
+	content: "\e705";
+}
+
+.cuIcon-copy:before {
+	content: "\e706";
+}
+
+.cuIcon-countdownfill:before {
+	content: "\e707";
+}
+
+.cuIcon-countdown:before {
+	content: "\e708";
+}
+
+.cuIcon-noticefill:before {
+	content: "\e709";
+}
+
+.cuIcon-notice:before {
+	content: "\e70a";
+}
+
+.cuIcon-upstagefill:before {
+	content: "\e70e";
+}
+
+.cuIcon-upstage:before {
+	content: "\e70f";
+}
+
+.cuIcon-babyfill:before {
+	content: "\e710";
+}
+
+.cuIcon-baby:before {
+	content: "\e711";
+}
+
+.cuIcon-brandfill:before {
+	content: "\e712";
+}
+
+.cuIcon-brand:before {
+	content: "\e713";
+}
+
+.cuIcon-choicenessfill:before {
+	content: "\e714";
+}
+
+.cuIcon-choiceness:before {
+	content: "\e715";
+}
+
+.cuIcon-clothesfill:before {
+	content: "\e716";
+}
+
+.cuIcon-clothes:before {
+	content: "\e717";
+}
+
+.cuIcon-creativefill:before {
+	content: "\e718";
+}
+
+.cuIcon-creative:before {
+	content: "\e719";
+}
+
+.cuIcon-female:before {
+	content: "\e71a";
+}
+
+.cuIcon-keyboard:before {
+	content: "\e71b";
+}
+
+.cuIcon-male:before {
+	content: "\e71c";
+}
+
+.cuIcon-newfill:before {
+	content: "\e71d";
+}
+
+.cuIcon-new:before {
+	content: "\e71e";
+}
+
+.cuIcon-pullleft:before {
+	content: "\e71f";
+}
+
+.cuIcon-pullright:before {
+	content: "\e720";
+}
+
+.cuIcon-rankfill:before {
+	content: "\e721";
+}
+
+.cuIcon-rank:before {
+	content: "\e722";
+}
+
+.cuIcon-bad:before {
+	content: "\e723";
+}
+
+.cuIcon-cameraadd:before {
+	content: "\e724";
+}
+
+.cuIcon-focus:before {
+	content: "\e725";
+}
+
+.cuIcon-friendfill:before {
+	content: "\e726";
+}
+
+.cuIcon-cameraaddfill:before {
+	content: "\e727";
+}
+
+.cuIcon-apps:before {
+	content: "\e729";
+}
+
+.cuIcon-paintfill:before {
+	content: "\e72a";
+}
+
+.cuIcon-paint:before {
+	content: "\e72b";
+}
+
+.cuIcon-picfill:before {
+	content: "\e72c";
+}
+
+.cuIcon-refresharrow:before {
+	content: "\e72d";
+}
+
+.cuIcon-colorlens:before {
+	content: "\e6e6";
+}
+
+.cuIcon-markfill:before {
+	content: "\e730";
+}
+
+.cuIcon-mark:before {
+	content: "\e731";
+}
+
+.cuIcon-presentfill:before {
+	content: "\e732";
+}
+
+.cuIcon-repeal:before {
+	content: "\e733";
+}
+
+.cuIcon-album:before {
+	content: "\e734";
+}
+
+.cuIcon-peoplefill:before {
+	content: "\e735";
+}
+
+.cuIcon-people:before {
+	content: "\e736";
+}
+
+.cuIcon-servicefill:before {
+	content: "\e737";
+}
+
+.cuIcon-repair:before {
+	content: "\e738";
+}
+
+.cuIcon-file:before {
+	content: "\e739";
+}
+
+.cuIcon-repairfill:before {
+	content: "\e73a";
+}
+
+.cuIcon-taoxiaopu:before {
+	content: "\e73b";
+}
+
+.cuIcon-weixin:before {
+	content: "\e612";
+}
+
+.cuIcon-attentionfill:before {
+	content: "\e73c";
+}
+
+.cuIcon-attention:before {
+	content: "\e73d";
+}
+
+.cuIcon-commandfill:before {
+	content: "\e73e";
+}
+
+.cuIcon-command:before {
+	content: "\e73f";
+}
+
+.cuIcon-communityfill:before {
+	content: "\e740";
+}
+
+.cuIcon-community:before {
+	content: "\e741";
+}
+
+.cuIcon-read:before {
+	content: "\e742";
+}
+
+.cuIcon-calendar:before {
+	content: "\e74a";
+}
+
+.cuIcon-cut:before {
+	content: "\e74b";
+}
+
+.cuIcon-magic:before {
+	content: "\e74c";
+}
+
+.cuIcon-backwardfill:before {
+	content: "\e74d";
+}
+
+.cuIcon-playfill:before {
+	content: "\e74f";
+}
+
+.cuIcon-stop:before {
+	content: "\e750";
+}
+
+.cuIcon-tagfill:before {
+	content: "\e751";
+}
+
+.cuIcon-tag:before {
+	content: "\e752";
+}
+
+.cuIcon-group:before {
+	content: "\e753";
+}
+
+.cuIcon-all:before {
+	content: "\e755";
+}
+
+.cuIcon-backdelete:before {
+	content: "\e756";
+}
+
+.cuIcon-hotfill:before {
+	content: "\e757";
+}
+
+.cuIcon-hot:before {
+	content: "\e758";
+}
+
+.cuIcon-post:before {
+	content: "\e759";
+}
+
+.cuIcon-radiobox:before {
+	content: "\e75b";
+}
+
+.cuIcon-rounddown:before {
+	content: "\e75c";
+}
+
+.cuIcon-upload:before {
+	content: "\e75d";
+}
+
+.cuIcon-writefill:before {
+	content: "\e760";
+}
+
+.cuIcon-write:before {
+	content: "\e761";
+}
+
+.cuIcon-radioboxfill:before {
+	content: "\e763";
+}
+
+.cuIcon-punch:before {
+	content: "\e764";
+}
+
+.cuIcon-shake:before {
+	content: "\e765";
+}
+
+.cuIcon-move:before {
+	content: "\e768";
+}
+
+.cuIcon-safe:before {
+	content: "\e769";
+}
+
+.cuIcon-activityfill:before {
+	content: "\e775";
+}
+
+.cuIcon-crownfill:before {
+	content: "\e776";
+}
+
+.cuIcon-crown:before {
+	content: "\e777";
+}
+
+.cuIcon-goodsfill:before {
+	content: "\e778";
+}
+
+.cuIcon-messagefill:before {
+	content: "\e779";
+}
+
+.cuIcon-profilefill:before {
+	content: "\e77a";
+}
+
+.cuIcon-sound:before {
+	content: "\e77b";
+}
+
+.cuIcon-sponsorfill:before {
+	content: "\e77c";
+}
+
+.cuIcon-sponsor:before {
+	content: "\e77d";
+}
+
+.cuIcon-upblock:before {
+	content: "\e77e";
+}
+
+.cuIcon-weblock:before {
+	content: "\e77f";
+}
+
+.cuIcon-weunblock:before {
+	content: "\e780";
+}
+
+.cuIcon-my:before {
+	content: "\e78b";
+}
+
+.cuIcon-myfill:before {
+	content: "\e78c";
+}
+
+.cuIcon-emojifill:before {
+	content: "\e78d";
+}
+
+.cuIcon-emojiflashfill:before {
+	content: "\e78e";
+}
+
+.cuIcon-flashbuyfill:before {
+	content: "\e78f";
+}
+
+.cuIcon-text:before {
+	content: "\e791";
+}
+
+.cuIcon-goodsfavor:before {
+	content: "\e794";
+}
+
+.cuIcon-musicfill:before {
+	content: "\e795";
+}
+
+.cuIcon-musicforbidfill:before {
+	content: "\e796";
+}
+
+.cuIcon-card:before {
+	content: "\e624";
+}
+
+.cuIcon-triangledownfill:before {
+	content: "\e79b";
+}
+
+.cuIcon-triangleupfill:before {
+	content: "\e79c";
+}
+
+.cuIcon-roundleftfill-copy:before {
+	content: "\e79e";
+}
+
+.cuIcon-font:before {
+	content: "\e76a";
+}
+
+.cuIcon-title:before {
+	content: "\e82f";
+}
+
+.cuIcon-recordfill:before {
+	content: "\e7a4";
+}
+
+.cuIcon-record:before {
+	content: "\e7a6";
+}
+
+.cuIcon-cardboardfill:before {
+	content: "\e7a9";
+}
+.cuIcon-cardboard:before {
+	content: "\e7aa";
+}
+
+.cuIcon-formfill:before {
+	content: "\e7ab";
+}
+
+.cuIcon-coin:before {
+	content: "\e7ac";
+}
+
+.cuIcon-cardboardforbid:before {
+	content: "\e7af";
+}
+
+.cuIcon-circlefill:before {
+	content: "\e7b0";
+}
+
+.cuIcon-circle:before {
+	content: "\e7b1";
+}
+
+.cuIcon-attentionforbid:before {
+	content: "\e7b2";
+}
+
+.cuIcon-attentionforbidfill:before {
+	content: "\e7b3";
+}
+
+.cuIcon-attentionfavorfill:before {
+	content: "\e7b4";
+}
+
+.cuIcon-attentionfavor:before {
+	content: "\e7b5";
+}
+
+.cuIcon-titles:before {
+	content: "\e701";
+}
+
+.cuIcon-icloading:before {
+	content: "\e67a";
+}
+
+.cuIcon-full:before {
+	content: "\e7bc";
+}
+
+.cuIcon-mail:before {
+	content: "\e7bd";
+}
+
+.cuIcon-peoplelist:before {
+	content: "\e7be";
+}
+
+.cuIcon-goodsnewfill:before {
+	content: "\e7bf";
+}
+
+.cuIcon-goodsnew:before {
+	content: "\e7c0";
+}
+
+.cuIcon-medalfill:before {
+	content: "\e7c1";
+}
+
+.cuIcon-medal:before {
+	content: "\e7c2";
+}
+
+.cuIcon-newsfill:before {
+	content: "\e7c3";
+}
+
+.cuIcon-newshotfill:before {
+	content: "\e7c4";
+}
+
+.cuIcon-newshot:before {
+	content: "\e7c5";
+}
+
+.cuIcon-news:before {
+	content: "\e7c6";
+}
+
+.cuIcon-videofill:before {
+	content: "\e7c7";
+}
+
+.cuIcon-video:before {
+	content: "\e7c8";
+}
+
+.cuIcon-exit:before {
+	content: "\e7cb";
+}
+
+.cuIcon-skinfill:before {
+	content: "\e7cc";
+}
+
+.cuIcon-skin:before {
+	content: "\e7cd";
+}
+
+.cuIcon-moneybagfill:before {
+	content: "\e7ce";
+}
+
+.cuIcon-usefullfill:before {
+	content: "\e7cf";
+}
+
+.cuIcon-usefull:before {
+	content: "\e7d0";
+}
+
+.cuIcon-moneybag:before {
+	content: "\e7d1";
+}
+
+.cuIcon-redpacket_fill:before {
+	content: "\e7d3";
+}
+
+.cuIcon-subscription:before {
+	content: "\e7d4";
+}
+
+.cuIcon-loading1:before {
+	content: "\e633";
+}
+
+.cuIcon-github:before {
+	content: "\e692";
+}
+
+.cuIcon-global:before {
+	content: "\e7eb";
+}
+
+.cuIcon-settingsfill:before {
+	content: "\e6ab";
+}
+
+.cuIcon-back_android:before {
+	content: "\e7ed";
+}
+
+.cuIcon-expressman:before {
+	content: "\e7ef";
+}
+
+.cuIcon-evaluate_fill:before {
+	content: "\e7f0";
+}
+
+.cuIcon-group_fill:before {
+	content: "\e7f5";
+}
+
+.cuIcon-play_forward_fill:before {
+	content: "\e7f6";
+}
+
+.cuIcon-deliver_fill:before {
+	content: "\e7f7";
+}
+
+.cuIcon-notice_forbid_fill:before {
+	content: "\e7f8";
+}
+
+.cuIcon-fork:before {
+	content: "\e60c";
+}
+
+.cuIcon-pick:before {
+	content: "\e7fa";
+}
+
+.cuIcon-wenzi:before {
+	content: "\e6a7";
+}
+
+.cuIcon-ellipse:before {
+	content: "\e600";
+}
+
+.cuIcon-qr_code:before {
+	content: "\e61b";
+}
+
+.cuIcon-dianhua:before {
+	content: "\e64d";
+}
+
+.cuIcon-icon:before {
+	content: "\e602";
+}
+
+.cuIcon-loading2:before {
+	content: "\e7f1";
+}
+
+.cuIcon-btn:before {
+	content: "\e601";
+}
diff --git a/src/views/regional/statistics/overview/css/index.css b/src/views/regional/statistics/overview/css/index.css
new file mode 100644
index 0000000..d6b10c8
--- /dev/null
+++ b/src/views/regional/statistics/overview/css/index.css
@@ -0,0 +1,510 @@
+@charset "UTF-8";
+
+/* CSS Document */
+.bg {
+  margin: 0 auto;
+  width: 100%;
+  min-height: 100vh;
+  background: url(../images/bg2.jpg) no-repeat;
+  background-size: 100% 100%;
+  padding-top: 0rem;
+  padding: 0rem 3.125rem;
+
+}
+
+/*.conIn{
+	display:flex;
+	display: -webkit-flex;}*/
+.title {
+  width: 100%;
+  font-size: 1.875rem;
+  line-height: 4.6875rem;
+  color: rgba(14, 253, 255, 1);
+  text-align: center;
+  font-weight: bold;
+}
+
+.border_bg_leftTop {
+  position: absolute;
+  left: -0.125rem;
+  top: -0.625rem;
+  width: 5.78125rem;
+  height: 0.78125rem;
+  display: block;
+  background: #01279d url(../images/title_left_bg.png) no-repeat;
+  background-size: cover;
+}
+
+.border_bg_rightTop {
+  position: absolute;
+  right: -0.15625rem;
+  top: -0.15625rem;
+  width: 1.5625rem;
+  height: 1.5625rem;
+  display: block;
+  background: url(../images/border_bg.jpg) no-repeat;
+  background-size: cover;
+}
+
+.border_bg_leftBottom {
+  position: absolute;
+  left: -0.125rem;
+  bottom: -0.125rem;
+  width: 1.5625rem;
+  height: 1.5625rem;
+  display: block;
+  background: url(../images/border_bg.jpg) no-repeat;
+  background-size: cover;
+}
+
+.border_bg_rightBottom {
+  position: absolute;
+  right: -0.15625rem;
+  bottom: -0.15625rem;
+  width: 1.25rem;
+  height: 1.25rem;
+  display: block;
+  background: url(../images/title_right_bg.png) no-repeat;
+  background-size: cover;
+}
+
+.leftMain {
+  width: 75%;
+  float: left;
+  padding-right: 1.5625rem;
+  padding-top: 1.5625rem;
+}
+
+.rightMain {
+  width: 25%;
+  float: left;
+  padding-top: 1.5625rem;
+}
+
+.leftMain_top {
+  width: 100%;
+  padding-bottom: 1.5625rem;
+}
+
+.leftMain_top ul {
+  display: flex;
+  display: -webkit-flex;
+}
+
+.leftMain_top ul li {
+  float: left;
+  width: 25%;
+  padding-right: 1.5625rem;
+}
+
+.leftMain_top ul li:last-child {
+  padding: 0;
+}
+
+.leftMain_top ul li .liIn {
+  border: 0.125rem solid rgba(14, 253, 255, 0.5);
+  width: 100%;
+  min-height: 3.75rem;
+  position: relative;
+  padding: .625rem 1.5625rem;
+}
+
+.leftMain_top ul li .liIn h3 {
+  font-size: 1.25rem;
+  font-weight: 700;
+  color: #fff;
+}
+
+.leftMain_top ul li .liIn .shu {
+  font-size: 1.875rem;
+  color: rgba(14, 253, 255, 1);
+  font-family: dig;
+  margin-bottom: 0.3125rem;
+}
+
+.leftMain_top ul li .liIn .shu i {
+  font-size: 1rem;
+  margin-left: 0.9375rem;
+  font-style: normal;
+}
+
+.leftMain_top ul li .liIn .zi {
+  font-size: 0.625rem;
+  color: #fff;
+  position: relative;
+  z-index: 10;
+}
+
+.leftMain_top ul li .liIn .zi .span1 {
+  margin-right: 1.5625rem;
+}
+
+
+.leftMain_middle {
+  width: 100%;
+  padding-bottom: 1.5625rem;
+  display: flex;
+  display: -webkit-flex;
+}
+
+.leftMain_middle .leftMain_middle_left {
+  width: 60%;
+  padding-right: 1.5625rem;
+}
+
+.leftMain_middle .leftMain_middle_left .leftMain_middle_leftIn {
+  border: 0.125rem solid rgba(14, 253, 255, 0.5);
+  width: 100%;
+  min-height: 3.75rem;
+  position: relative;
+  padding: .625rem;
+}
+
+.leftMain_middle_leftIn_zhe {
+  margin-top: 2vh;
+}
+
+.leftMain_middle .leftMain_middle_left .leftMain_middle_leftIn h3 {
+  font-size: 1.25rem;
+  color: #fff;
+  font-weight: 700;
+  margin-bottom: 0.78125rem;
+}
+
+.leftMain_middle .leftMain_middle_left .leftMain_middle_leftIn .biaoge {
+  min-height: 12.5rem;
+}
+
+.leftMain_middle .leftMain_middle_right {
+  width: 40%;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn {
+  border: 0.125rem solid rgba(14, 253, 255, 0.5);
+  width: 100%;
+  min-height: 3.75rem;
+  position: relative;
+  padding: .625rem;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn h3 {
+  font-size: 1.25rem;
+  color: #fff;
+  font-weight: 700;
+  margin-bottom: 0.78125rem;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge {
+  min-height: 12.5rem;
+}
+
+/*左边中间部分排行榜*/
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai {
+  width: 100%;
+  height: 68vh;
+  overflow: hidden;
+}
+
+/* .leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul{
+  height: 68vh;
+} */
+
+  
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn {
+  display: flex;
+  display: -webkit-flex;
+  align-items: center;
+  color: #fff;
+  font-size: 0.9375rem;
+  height: 2.8125rem;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_left {
+  width: 43%;
+  position: relative;
+  padding-left: 1.25rem;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_left .bot {
+  width: 1.25rem;
+  height: 1.25rem;
+  background: #05d1fc;
+  border-radius: 62.5rem;
+  display: block;
+  position: absolute;
+  left: 0.3125rem;
+  top: 0;
+  bottom: 0;
+  margin: auto 0;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn2 .liIn_left .bot {
+  background: #e7feb8;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn3 .liIn_left .bot {
+  background: #fdea8a;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn4 .liIn_left .bot {
+  background: #8ff9f8;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn5 .liIn_left .bot {
+  background: #d890fa;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn6 .liIn_left .bot {
+  background: #05d1fc;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_left zi {
+ }
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_line {
+  width: 40%;
+  height: 1.25rem;
+  background: rgba(255, 255, 255, 0.5);
+  border-radius: 125rem;
+   overflow: hidden;
+   position: relative;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .liIn_line .line_lineIn {
+  width: 100%;
+  height: 1.25rem;
+  background: #05d1fc;
+  border-radius: 125rem;
+  -webkit-animation: widthMove1 2s ease-in-out;
+}
+
+.line_lineIn .per {
+  position: absolute;
+  top: 0;
+  left: 50%;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn2 .liIn_line .line_lineIn {
+  background: #e7feb8;
+  -webkit-animation: widthMove2 2s ease-in-out;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn3 .liIn_line .line_lineIn {
+  background: #fdea8a;
+  -webkit-animation: widthMove3 2s ease-in-out;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn4 .liIn_line .line_lineIn {
+  background: #8ff9f8;
+  -webkit-animation: widthMove4 2s ease-in-out;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn5 .liIn_line .line_lineIn {
+  background: #d890fa;
+  -webkit-animation: widthMove5 2s ease-in-out;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn6 .liIn_line .line_lineIn {
+  background: #05d1fc;
+  -webkit-animation: widthMove6 2s ease-in-out;
+}
+
+@-webkit-keyframes widthMove1 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 98.5%;
+  }
+}
+
+@-webkit-keyframes widthMove2 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 88.5%;
+  }
+}
+
+@-webkit-keyframes widthMove3 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 68.5%;
+  }
+}
+
+@-webkit-keyframes widthMove4 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 40.5%;
+  }
+}
+
+@-webkit-keyframes widthMove5 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 22.5%;
+  }
+}
+
+@-webkit-keyframes widthMove6 {
+  0% {
+    width: 0%;
+  }
+
+  100% {
+    width: 10.5%;
+  }
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_pai ul li .liIn .num {
+  width: 18%;
+  font-family: dig;
+  padding-left: 0.3125rem;
+}
+
+/*左边底部*/
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_bi ul {
+  display: flex;
+  display: -webkit-flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_bi ul li {
+  width: 33.3%;
+  text-align: center;
+  margin-bottom: 0.78125rem;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_bi ul li .shu {
+  font-size: 2.1875rem;
+  color: rgba(14, 253, 255, 1);
+  font-family: dig;
+  padding: 1.875rem 0 0.3125rem;
+  font-weight: normal;
+}
+
+.leftMain_middle .leftMain_middle_right .leftMain_middle_rightIn .biaoge_bi ul li .zi {
+  font-size: 0.9375rem;
+  color: #fff;
+}
+
+/*右边部分*/
+.rightMain .rightMain_top {
+  width: 100%;
+  padding-bottom: 1.5625rem;
+}
+
+.rightMain .rightMain_topIn {
+  border: 0.125rem solid rgba(14, 253, 255, 0.5);
+  width: 100%;
+  min-height: 3.75rem;
+  position: relative;
+  padding: .625rem;
+}
+
+.rightMain .rightMain_topIn h3 {
+  font-size: 1.25rem;
+  color: #fff;
+  margin-bottom: 0.78125rem;
+  font-weight: 700;
+}
+
+.rightMain .rightMain_topIn .biaoge {
+  min-height: 12.5rem;
+}
+
+.rightMain .rightMain_bottom {
+  width: 100%;
+}
+
+.rightMain .rightMain_bottomIn {
+  border: 0.125rem solid rgba(14, 253, 255, 0.5);
+  width: 100%;
+  min-height: 3.75rem;
+  position: relative;
+  padding: 1.25rem 0.78125rem;
+}
+
+.rightMain .rightMain_bottomIn h3 {
+  font-size: 1.25rem;
+  color: #fff;
+  margin-bottom: 0.78125rem;
+  font-weight: 700;
+}
+
+/*右下角表格*/
+.rightMain .rightMain_bottomIn .biaoge {
+  min-height: 12.5rem;
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list {
+  overflow: hidden;
+  position: relative;
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list .biaoge_listIn .ul_list {
+  overflow: hidden;
+  position: relative;
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list .biaoge_listIn .ul_listIn {
+  -webkit-animation: 14s gundong linear infinite normal;
+  animation: 14s gundong linear infinite normal;
+  position: relative;
+}
+
+@keyframes gundong {
+  0% {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  100% {
+    -webkit-transform: translate3d(0, -30vh, 0);
+    transform: translate3d(0, -30vh, 0);
+  }
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list ul {
+  display: flex;
+  display: -webkit-flex;
+  width: 100%;
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list .ul_title {
+  background: linear-gradient(left, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1));
+  background: -ms-linear-gradient(left, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1));
+  background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1));
+  background: -moz-linear-gradient(left, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1));
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list .ul_con {
+  border-bottom: 0.125rem solid rgba(14, 253, 255, 0.5);
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list ul li {
+  width: 20%;
+  text-align: center;
+  color: #fff;
+  font-size: 0.9375rem;
+  height: 3.125rem;
+  line-height: 3.125rem;
+}
+
+.rightMain .rightMain_bottomIn .biaoge_list ul li:frist-child {
+  text-align: left;
+}
\ No newline at end of file
diff --git a/src/views/regional/statistics/overview/css/public.css b/src/views/regional/statistics/overview/css/public.css
new file mode 100644
index 0000000..203b98a
--- /dev/null
+++ b/src/views/regional/statistics/overview/css/public.css
@@ -0,0 +1,1063 @@
+@charset "utf-8";
+/* CSS Document */
+@font-face{
+            font-family: 'dig';
+            src : url('../fonts/DIN-Bold.otf');
+        }
+body,p,div,h1,h2,h3,h4,h5,h6,button,input,ol,li,ul,dl,dt,dd,img,table,tr,td,th,select{
+	margin:0;
+	padding:0;
+  　-webkit-appearance:none;
+    border:0;
+    list-style:none;
+	box-sizing:border-box;}
+a,img,button,input,textarea{-webkit-tap-highlight-color:rgba(255,255,255,0); outline-color:#0081ff; background:none;}
+button{
+	outline:none;}
+input::-webkit-input-placeholder {
+    color:#aaa;
+	}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button{
+    -webkit-appearance: none !important;
+    margin: 0;
+}
+input[type="number"]{-moz-appearance:textfield;}
+body{
+	margin:0 auto;
+	font-size:16px;
+	color:#121212;
+	font-family:"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+	position:relative;
+	}
+a{
+	text-decoration:none;
+	color:#f06000;}
+
+.noborder{
+	border:0 !important}
+
+#header{
+	height:0.5rem;
+	width:100%;
+	position:fixed;
+	top:0;
+	left:0;
+	z-index:1000;
+	}
+.header{
+	height:0.5rem;
+	width:100%;
+	position:fixed;
+	top:0;
+	left:0;
+	z-index:1000;
+	}
+.headerIn{
+	width:100%;
+	height:100%;
+	position:relative;
+	background:#0081ff;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+
+}
+.headerIn .back{
+	display: flex;
+	height: 100%;
+	align-items: center;
+	padding-left:0.2rem;
+	font-size:0.14rem;
+	color:#fff;
+	width:20%;
+}
+.headerIn .save{
+	display: flex;
+	height:65%;
+	align-items: center;
+	font-size:0.14rem;
+	color:#fff;
+	padding:0 0.2rem;
+	text-align:right;
+	justify-content:center;
+	margin-right:0.1rem;
+	border-radius:3px;
+	border:1px solid #fff;
+}
+
+.cuIcon-back:before{
+	margin-right:3px;
+	font-size:0.16rem;}
+.headerIn h2{
+	width:50%;
+	font-size:0.18rem;
+	color:#fff;
+	font-weight:normal;
+	text-align:center;
+	margin:0 auto;
+	padding:0;
+	font-family:"微软雅黑";
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap;
+	position:absolute;
+	left:0;
+	right:0;
+	top:0;
+	margin:auto;
+	height:100%;
+	line-height:0.5rem;}
+.headerIn .sel{
+	position:absolute;
+	top:0;
+	right:0;
+	display:block;
+	width:30%;
+	height:100%;
+	background:url(../images/icon_sel.png) no-repeat 90% center;
+	background-size:20px auto;
+	padding-right:25px;
+	color:#fff;
+	line-height:45px;}
+.headerIn .share{
+	position:absolute;
+	top:0;
+	right:10px;
+	display:block;
+	width:60px;
+	height:100%;
+	background:url(../images/icon_share.png) no-repeat 5px center;
+	background-size:20px auto;
+	padding-left:25px;
+	color:#fff;
+	line-height:45px;
+	text-align:right;
+	font-size:14px;}
+
+
+.zhezhao_new{
+	position:fixed;
+	z-index:100000;
+	background:rgba(0,0,0,0.5);
+	width:100%;
+	height:20000px;
+	top:0;
+	left:0;}
+
+.nodate {
+  background: url(../images/nodate.png) no-repeat top center;
+  background-size: 65px auto;
+  padding-top: 75px;
+  text-align: center;
+  font-size: 14px;
+  color: #888;
+  line-height: 24px;
+  width: 90%;
+  margin: 0 auto;
+}
+.nodate2 {
+  background: url(../images/nodate8.png) no-repeat top center;
+  background-size:160px auto;
+  padding-top:150px;
+  text-align: center;
+  font-size: 14px;
+  color:#888;
+  line-height:24px;
+  width: 90%;
+  margin:150px auto 0;
+}
+.nodate3 {
+  background: url(../images/nodate10.png) no-repeat top center;
+  background-size:160px auto;
+  padding-top:150px;
+  text-align: center;
+  font-size: 14px;
+  color:#888;
+  line-height:24px;
+  width: 90%;
+  margin:150px auto 0;
+}
+.nodate3 .goto{
+  display:block;
+  width:120px;
+  height:40px;
+  background:none;
+  border:1px solid #f06000;
+  border-radius:5px;
+  color:#f06000;
+  font-size:16px;
+  font-family:"微软雅黑";
+  text-align:center;
+  margin:20px auto;
+  line-height:38px;}
+.eggloading{
+  background: url(../images/loading2.gif) no-repeat top center;
+  background-size:60px auto;
+  padding-top:60px;
+  text-align: center;
+  font-size: 14px;
+  color: #888;
+  line-height: 24px;
+  width: 90%;
+  margin:200px auto 0;
+}
+.articleDel{
+  background: url(../images/nodate9.png) no-repeat top center;
+  background-size:160px auto;
+  padding-top:150px;
+  text-align: center;
+  font-size: 14px;
+  color:#888;
+  line-height:24px;
+  width: 90%;
+  margin:150px auto 0;
+}
+
+
+body .spinner-android{
+	display:none;}
+body .loading{
+  background:url(../images/loading2.gif) no-repeat center center;
+  background-size:60px auto;
+  width:80px;
+  height:80px;
+  padding:10px;
+}
+
+/*资讯白色头部*/
+.headerIn2{
+	width:100%;
+	height:100%;
+	position:relative;
+	background:#fff;
+	max-width:640px;
+	margin:0 auto;
+	box-shadow:1px 0 3px #aaa;
+	-webkit-box-shadow: 1px 0 3px #aaa;
+	-moz-box-shadow: 1px 0 3px #aaa;
+	}
+.headerIn2 .back{
+	position:absolute;
+	top:0;
+	left:0;
+	display:block;
+	width:20%;
+	height:100%;
+	background:url(../images/back4.png) no-repeat 10px center;
+	background-size:12px auto;
+	padding-left:25px;
+	color:#555;
+	line-height:45px;
+	}
+.headerIn2 h2{
+	width:80%;
+	height:100%;
+	line-height:45px;
+	font-size:16px;
+	color:#555;
+	font-weight:normal;
+	text-align:center;
+	margin:0 auto;
+	padding:0;
+	font-family:"微软雅黑";
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap;
+	font-weight:bold;}
+.headerIn2 h2 img{
+	height:100%;
+	}
+.headerIn2 .share{
+	position:absolute;
+	top:0;
+	right:10px;
+	display:block;
+	width:60px;
+	height:100%;
+	background:url(../images/zixun_icon_share.png) no-repeat right center;
+	background-size:20px auto;
+	padding-left:25px;
+	color:#fff;
+	line-height:45px;
+	text-align:right;
+	font-size:15px;}
+.headerIn2 .fabu{
+	position:absolute;
+	top:7px;
+	right:10px;
+	height:30px;
+	line-height:30px;
+	padding:0 8px;
+	font-size:15px;
+	background:#f06000;
+	color:#fff;
+	border-radius:3px;}
+
+
+
+body {
+	/* Color 可以自定义相关配色 */
+	/* var属性兼容性 --> https://www.caniuse.com/#feat=css-variables */
+	/* 标准色 */
+	--red: #e54d42;
+	--orange: #f37b1d;
+	--yellow: #fbbd08;
+	--olive: #8dc63f;
+	--green: #39b54a;
+	--cyan: #1cbbb4;
+	--blue: #0081ff;
+	--purple: #6739b6;
+	--mauve: #9c26b0;
+	--pink: #e03997;
+	--brown: #a5673f;
+	--grey: #8799a3;
+	--black: #333333;
+	--darkGray: #666666;
+	--gray: #aaaaaa;
+	--ghostWhite: #f1f1f1;
+	--white: #ffffff;
+	/* 浅色 */
+	--redLight: #fadbd9;
+	--orangeLight: #fde6d2;
+	--yellowLight: #fef2ce;
+	--oliveLight: #e8f4d9;
+	--greenLight: #d7f0db;
+	--cyanLight: #d2f1f0;
+	--blueLight: #cce6ff;
+	--purpleLight: #e1d7f0;
+	--mauveLight: #ebd4ef;
+	--pinkLight: #f9d7ea;
+	--brownLight: #ede1d9;
+	--greyLight: #e7ebed;
+	/* 渐变色 */
+	--gradualRed: linear-gradient(45deg, #f43f3b, #ec008c);
+	--gradualOrange: linear-gradient(45deg, #ff9700, #ed1c24);
+	--gradualGreen: linear-gradient(45deg, #39b54a, #8dc63f);
+	--gradualPurple: linear-gradient(45deg, #9000ff, #5e00ff);
+	--gradualPink: linear-gradient(45deg, #ec008c, #6739b6);
+	--gradualBlue: linear-gradient(45deg, #0081ff, #1cbbb4);
+	/* 阴影透明色 */
+	--ShadowSize: 6px 6px 8px;
+	--redShadow: rgba(204, 69, 59, 0.2);
+	--orangeShadow: rgba(217, 109, 26, 0.2);
+	--yellowShadow: rgba(224, 170, 7, 0.2);
+	--oliveShadow: rgba(124, 173, 55, 0.2);
+	--greenShadow: rgba(48, 156, 63, 0.2);
+	--cyanShadow: rgba(28, 187, 180, 0.2);
+	--blueShadow: rgba(0, 102, 204, 0.2);
+	--purpleShadow: rgba(88, 48, 156, 0.2);
+	--mauveShadow: rgba(133, 33, 150, 0.2);
+	--pinkShadow: rgba(199, 50, 134, 0.2);
+	--brownShadow: rgba(140, 88, 53, 0.2);
+	--greyShadow: rgba(114, 130, 138, 0.2);
+	--grayShadow: rgba(114, 130, 138, 0.2);
+	--blackShadow: rgba(26, 26, 26, 0.2);
+
+	background-color: var(--ghostWhite);
+	color: var(--black);
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+}
+
+/* -- 阴影 -- */
+
+.shadow[class*='white'] {
+	--ShadowSize: 0 1px 6px;
+}
+
+.shadow-lg {
+	--ShadowSize: 0px 0.4rem 1rem 0px;
+}
+
+.shadow-warp {
+	position: relative;
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+.shadow-warp:before,
+.shadow-warp:after {
+	position: absolute;
+	content: "";
+	top: 20px;
+	bottom: 30px;
+	left: 20px;
+	width: 50%;
+	box-shadow: 0 30px 20px rgba(0, 0, 0, 0.2);
+	transform: rotate(-3deg);
+	z-index: -1;
+}
+
+.shadow-warp:after {
+	right: 20px;
+	left: auto;
+	transform: rotate(3deg);
+}
+
+.shadow-blur {
+	position: relative;
+}
+
+.shadow-blur::before {
+	content: "";
+	display: block;
+	background: inherit;
+	filter: blur(0.1rem);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top:0.05rem;
+	left:0.05rem;
+	z-index: -1;
+	opacity: 0.4;
+	transform-origin: 0 0;
+	border-radius: inherit;
+	transform: scale(1, 1);
+}
+/* ==================
+          背景
+ ==================== */
+
+.line-red::after,
+.lines-red::after {
+	border-color: var(--red);
+}
+
+.line-orange::after,
+.lines-orange::after {
+	border-color: var(--orange);
+}
+
+.line-yellow::after,
+.lines-yellow::after {
+	border-color: var(--yellow);
+}
+
+.line-olive::after,
+.lines-olive::after {
+	border-color: var(--olive);
+}
+
+.line-green::after,
+.lines-green::after {
+	border-color: var(--green);
+}
+
+.line-cyan::after,
+.lines-cyan::after {
+	border-color: var(--cyan);
+}
+
+.line-blue::after,
+.lines-blue::after {
+	border-color: var(--blue);
+}
+
+.line-purple::after,
+.lines-purple::after {
+	border-color: var(--purple);
+}
+
+.line-mauve::after,
+.lines-mauve::after {
+	border-color: var(--mauve);
+}
+
+.line-pink::after,
+.lines-pink::after {
+	border-color: var(--pink);
+}
+
+.line-brown::after,
+.lines-brown::after {
+	border-color: var(--brown);
+}
+
+.line-grey::after,
+.lines-grey::after {
+	border-color: var(--grey);
+}
+
+.line-gray::after,
+.lines-gray::after {
+	border-color: var(--gray);
+}
+
+.line-black::after,
+.lines-black::after {
+	border-color: var(--black);
+}
+
+.line-white::after,
+.lines-white::after {
+	border-color: var(--white);
+}
+
+.bg-red {
+	background-color: var(--red);
+	color: var(--white);
+}
+
+.bg-orange {
+	background-color: var(--orange);
+	color: var(--white);
+}
+
+.bg-yellow {
+	background-color: var(--yellow);
+	color: var(--black);
+}
+
+.bg-olive {
+	background-color: var(--olive);
+	color: var(--white);
+}
+
+.bg-green {
+	background-color: var(--green);
+	color: var(--white);
+}
+
+.bg-cyan {
+	background-color: var(--cyan);
+	color: var(--white);
+}
+
+.bg-blue {
+	background-color: var(--blue);
+	color: var(--white);
+}
+
+.bg-purple {
+	background-color: var(--purple);
+	color: var(--white);
+}
+
+.bg-mauve {
+	background-color: var(--mauve);
+	color: var(--white);
+}
+
+.bg-pink {
+	background-color: var(--pink);
+	color: var(--white);
+}
+
+.bg-brown {
+	background-color: var(--brown);
+	color: var(--white);
+}
+
+.bg-grey {
+	background-color: var(--grey);
+	color: var(--white);
+}
+
+.bg-gray {
+	background-color: #f0f0f0;
+	color: var(--black);
+}
+
+.bg-black {
+	background-color: var(--black);
+	color: var(--white);
+}
+
+.bg-white {
+	background-color: var(--white);
+	color: var(--darkGray);
+}
+
+.bg-shadeTop {
+	background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.01));
+	color: var(--white);
+}
+
+.bg-shadeBottom {
+	background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 1));
+	color: var(--white);
+}
+
+.bg-red.light {
+	color: var(--red);
+	background-color: var(--redLight);
+}
+
+.bg-orange.light {
+	color: var(--orange);
+	background-color: var(--orangeLight);
+}
+
+.bg-yellow.light {
+	color: var(--yellow);
+	background-color: var(--yellowLight);
+}
+
+.bg-olive.light {
+	color: var(--olive);
+	background-color: var(--oliveLight);
+}
+
+.bg-green.light {
+	color: var(--green);
+	background-color: var(--greenLight);
+}
+
+.bg-cyan.light {
+	color: var(--cyan);
+	background-color: var(--cyanLight);
+}
+
+.bg-blue.light {
+	color: var(--blue);
+	background-color: var(--blueLight);
+}
+
+.bg-purple.light {
+	color: var(--purple);
+	background-color: var(--purpleLight);
+}
+
+.bg-mauve.light {
+	color: var(--mauve);
+	background-color: var(--mauveLight);
+}
+
+.bg-pink.light {
+	color: var(--pink);
+	background-color: var(--pinkLight);
+}
+
+.bg-brown.light {
+	color: var(--brown);
+	background-color: var(--brownLight);
+}
+
+.bg-grey.light {
+	color: var(--grey);
+	background-color: var(--greyLight);
+}
+
+.bg-gradual-red {
+	background-image: var(--gradualRed);
+	color: var(--white);
+}
+
+.bg-gradual-orange {
+	background-image: var(--gradualOrange);
+	color: var(--white);
+}
+
+.bg-gradual-green {
+	background-image: var(--gradualGreen);
+	color: var(--white);
+}
+
+.bg-gradual-purple {
+	background-image: var(--gradualPurple);
+	color: var(--white);
+}
+
+.bg-gradual-pink {
+	background-image: var(--gradualPink);
+	color: var(--white);
+}
+
+.bg-gradual-blue {
+	background-image: var(--gradualBlue);
+	color: var(--white);
+}
+
+.shadow[class*="-red"] {
+	box-shadow: var(--ShadowSize) var(--redShadow);
+}
+
+.shadow[class*="-orange"] {
+	box-shadow: var(--ShadowSize) var(--orangeShadow);
+}
+
+.shadow[class*="-yellow"] {
+	box-shadow: var(--ShadowSize) var(--yellowShadow);
+}
+
+.shadow[class*="-olive"] {
+	box-shadow: var(--ShadowSize) var(--oliveShadow);
+}
+
+.shadow[class*="-green"] {
+	box-shadow: var(--ShadowSize) var(--greenShadow);
+}
+
+.shadow[class*="-cyan"] {
+	box-shadow: var(--ShadowSize) var(--cyanShadow);
+}
+
+.shadow[class*="-blue"] {
+	box-shadow: var(--ShadowSize) var(--blueShadow);
+}
+
+.shadow[class*="-purple"] {
+	box-shadow: var(--ShadowSize) var(--purpleShadow);
+}
+
+.shadow[class*="-mauve"] {
+	box-shadow: var(--ShadowSize) var(--mauveShadow);
+}
+
+.shadow[class*="-pink"] {
+	box-shadow: var(--ShadowSize) var(--pinkShadow);
+}
+
+.shadow[class*="-brown"] {
+	box-shadow: var(--ShadowSize) var(--brownShadow);
+}
+
+.shadow[class*="-grey"] {
+	box-shadow: var(--ShadowSize) var(--greyShadow);
+}
+
+.shadow[class*="-gray"] {
+	box-shadow: var(--ShadowSize) var(--grayShadow);
+}
+
+.shadow[class*="-black"] {
+	box-shadow: var(--ShadowSize) var(--blackShadow);
+}
+
+.shadow[class*="-white"] {
+	box-shadow: var(--ShadowSize) var(--blackShadow);
+}
+
+.text-shadow[class*="-red"] {
+	text-shadow: var(--ShadowSize) var(--redShadow);
+}
+
+.text-shadow[class*="-orange"] {
+	text-shadow: var(--ShadowSize) var(--orangeShadow);
+}
+
+.text-shadow[class*="-yellow"] {
+	text-shadow: var(--ShadowSize) var(--yellowShadow);
+}
+
+.text-shadow[class*="-olive"] {
+	text-shadow: var(--ShadowSize) var(--oliveShadow);
+}
+
+.text-shadow[class*="-green"] {
+	text-shadow: var(--ShadowSize) var(--greenShadow);
+}
+
+.text-shadow[class*="-cyan"] {
+	text-shadow: var(--ShadowSize) var(--cyanShadow);
+}
+
+.text-shadow[class*="-blue"] {
+	text-shadow: var(--ShadowSize) var(--blueShadow);
+}
+
+.text-shadow[class*="-purple"] {
+	text-shadow: var(--ShadowSize) var(--purpleShadow);
+}
+
+.text-shadow[class*="-mauve"] {
+	text-shadow: var(--ShadowSize) var(--mauveShadow);
+}
+
+.text-shadow[class*="-pink"] {
+	text-shadow: var(--ShadowSize) var(--pinkShadow);
+}
+
+.text-shadow[class*="-brown"] {
+	text-shadow: var(--ShadowSize) var(--brownShadow);
+}
+
+.text-shadow[class*="-grey"] {
+	text-shadow: var(--ShadowSize) var(--greyShadow);
+}
+
+.text-shadow[class*="-gray"] {
+	text-shadow: var(--ShadowSize) var(--grayShadow);
+}
+
+.text-shadow[class*="-black"] {
+	text-shadow: var(--ShadowSize) var(--blackShadow);
+}
+
+.bg-img {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+.bg-mask {
+	background-color: var(--black);
+	position: relative;
+}
+
+.bg-mask::after {
+	content: "";
+	border-radius: inherit;
+	width: 100%;
+	height: 100%;
+	display: block;
+	background-color: rgba(0, 0, 0, 0.4);
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+}
+
+.bg-mask div,
+.bg-mask cover-div {
+	z-index: 5;
+	position: relative;
+}
+
+.bg-video {
+	position: relative;
+}
+
+.bg-video video {
+	display: block;
+	height: 100%;
+	width: 100%;
+	-o-object-fit: cover;
+	object-fit: cover;
+	position: absolute;
+	top: 0;
+	z-index: 0;
+	pointer-events: none;
+}
+
+/* ==================
+          文本
+ ==================== */
+
+.text-Abc {
+	text-transform: Capitalize;
+}
+
+.text-ABC {
+	text-transform: Uppercase;
+}
+
+.text-abc {
+	text-transform: Lowercase;
+}
+
+.text-price::before {
+	content: "¥";
+	font-size: 80%;
+	margin-right: 4px;
+}
+
+.text-cut {
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.text-bold {
+	font-weight: bold;
+}
+
+.text-center {
+	text-align: center;
+}
+
+.text-content {
+	line-height: 1.6;
+}
+
+.text-left {
+	text-align: left;
+}
+
+.text-right {
+	text-align: right;
+}
+
+.text-red,
+.line-red,
+.lines-red {
+	color: var(--red);
+}
+
+.text-orange,
+.line-orange,
+.lines-orange {
+	color: var(--orange);
+}
+
+.text-yellow,
+.line-yellow,
+.lines-yellow {
+	color: var(--yellow);
+}
+
+.text-olive,
+.line-olive,
+.lines-olive {
+	color: var(--olive);
+}
+
+.text-green,
+.line-green,
+.lines-green {
+	color: var(--green);
+}
+
+.text-cyan,
+.line-cyan,
+.lines-cyan {
+	color: var(--cyan);
+}
+
+.text-blue,
+.line-blue,
+.lines-blue {
+	color: var(--blue);
+}
+
+.text-purple,
+.line-purple,
+.lines-purple {
+	color: var(--purple);
+}
+
+.text-mauve,
+.line-mauve,
+.lines-mauve {
+	color: var(--mauve);
+}
+
+.text-pink,
+.line-pink,
+.lines-pink {
+	color: var(--pink);
+}
+
+.text-brown,
+.line-brown,
+.lines-brown {
+	color: var(--brown);
+}
+
+.text-grey,
+.line-grey,
+.lines-grey {
+	color: var(--grey);
+}
+
+.text-gray,
+.line-gray,
+.lines-gray {
+	color: var(--gray);
+}
+
+.text-black,
+.line-black,
+.lines-black {
+	color: var(--black);
+}
+
+.text-white,
+.line-white,
+.lines-white {
+	color: var(--white);
+}
+.bdCon{
+	margin-top:0.5rem;}
+.anniu_btn{
+	width:100%;
+	padding:0.2rem;
+	}
+.anniu_btn button{
+	background:#0081ff;
+	height:0.4rem;
+	border-radius:5px;
+	color:#fff;
+	width:50%;
+	margin:0 auto;
+	display:block;
+	font-size:0.12rem;
+	max-width:200px;}
+@media only screen and (min-width: 1400px) {
+#header{
+	height:0.3rem;
+	}
+.header{
+	height:0.3rem;
+	}
+.headerIn .back{
+	font-size:0.08rem;
+}
+.headerIn .save{
+	font-size:0.08rem;
+}
+
+.cuIcon-back:before{
+	margin-right:3px;
+	font-size:0.1rem;}
+.headerIn h2{
+	font-size:0.1rem;
+	line-height:0.3rem;}
+.bdCon{
+	margin-top:0.3rem;}
+.anniu_btn button{
+	height:0.26rem;
+	font-size:0.08rem;
+	max-width:400px;}
+
+
+}
+@media screen and (max-width: 641px) {
+#header{
+	height:1rem;
+	}
+.header{
+	height:1rem;
+	}
+.headerIn .back{
+	font-size:0.3rem;
+}
+.headerIn .save{
+	font-size:0.3rem;
+}
+.cuIcon-back:before{
+	margin-right:3px;
+	font-size:0.3rem;}
+.headerIn h2{
+	font-size:0.32rem;
+	line-height:1rem;}
+.bdCon{
+	margin-top:1rem;}
+.anniu_btn{
+	padding:0.2rem 5%;}
+.anniu_btn button{
+	height:1rem;
+	font-size:0.3rem;
+	max-width:100%;
+	width:100%;
+	}
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/regional/statistics/overview/fonts/DIN-Bold.otf b/src/views/regional/statistics/overview/fonts/DIN-Bold.otf
new file mode 100644
index 0000000..782e68e
Binary files /dev/null and b/src/views/regional/statistics/overview/fonts/DIN-Bold.otf differ
diff --git a/src/views/regional/statistics/overview/fonts/DIN-Light.otf b/src/views/regional/statistics/overview/fonts/DIN-Light.otf
new file mode 100644
index 0000000..349739e
Binary files /dev/null and b/src/views/regional/statistics/overview/fonts/DIN-Light.otf differ
diff --git a/src/views/regional/statistics/overview/fonts/DIN-Medium.otf b/src/views/regional/statistics/overview/fonts/DIN-Medium.otf
new file mode 100644
index 0000000..3296d1e
Binary files /dev/null and b/src/views/regional/statistics/overview/fonts/DIN-Medium.otf differ
diff --git a/src/views/regional/statistics/overview/images/bg2.jpg b/src/views/regional/statistics/overview/images/bg2.jpg
new file mode 100644
index 0000000..f8d5ca4
Binary files /dev/null and b/src/views/regional/statistics/overview/images/bg2.jpg differ
diff --git a/src/views/regional/statistics/overview/images/border_bg.jpg b/src/views/regional/statistics/overview/images/border_bg.jpg
new file mode 100644
index 0000000..53ca0a9
Binary files /dev/null and b/src/views/regional/statistics/overview/images/border_bg.jpg differ
diff --git a/src/views/regional/statistics/overview/images/title_border_bg.png b/src/views/regional/statistics/overview/images/title_border_bg.png
new file mode 100644
index 0000000..1016436
Binary files /dev/null and b/src/views/regional/statistics/overview/images/title_border_bg.png differ
diff --git a/src/views/regional/statistics/overview/images/title_left_bg.png b/src/views/regional/statistics/overview/images/title_left_bg.png
new file mode 100644
index 0000000..e7cdea2
Binary files /dev/null and b/src/views/regional/statistics/overview/images/title_left_bg.png differ
diff --git a/src/views/regional/statistics/overview/images/title_right_bg.png b/src/views/regional/statistics/overview/images/title_right_bg.png
new file mode 100644
index 0000000..4edbe84
Binary files /dev/null and b/src/views/regional/statistics/overview/images/title_right_bg.png differ
diff --git a/src/views/regional/statistics/overview/index.vue b/src/views/regional/statistics/overview/index.vue
new file mode 100644
index 0000000..4e4f218
--- /dev/null
+++ b/src/views/regional/statistics/overview/index.vue
@@ -0,0 +1,524 @@
+<template>
+  <div class="bg">
+    <div class="title">区域检验数据中心</div>
+    <div class="leftMain">
+      <div class="leftMain_top">
+        <div class="leftMain_topIn">
+          <ul>
+            <li v-for="item in source">
+              <div class="liIn">
+                <h3>{{ item.name }}</h3>
+                <p class="shu"><span class="shu1">{{ item.num }}</span><i>{{ item.unit }}</i></p>
+                <span class="border_bg_leftTop"></span>
+                <span class="border_bg_rightTop"></span>
+                <span class="border_bg_leftBottom"></span>
+                <span class="border_bg_rightBottom"></span>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="leftMain_middle">
+        <div class="leftMain_middle_left">
+          <div class="leftMain_middle_leftIn">
+            <h3>委托机构当月送检标本数量</h3>
+            <!-- 为ECharts准备一个具备大小（宽高）的Dom -->
+            <div class="biaoge" style="width:100%; height:30vh" ref="chartmain" id="chartmain"></div>
+            <span class="border_bg_leftTop"></span>
+            <span class="border_bg_rightTop"></span>
+            <span class="border_bg_leftBottom"></span>
+            <span class="border_bg_rightBottom"></span>
+          </div>
+          <div class="leftMain_middle_leftIn leftMain_middle_leftIn_zhe">
+            <h3>近一个月送检标本数量趋势图</h3>
+            <div class="biaoge" style="width:100%; height:30vh" ref="chartmain_zhe" id="chartmain_zhe"></div>
+            <span class="border_bg_leftTop"></span>
+            <span class="border_bg_rightTop"></span>
+            <span class="border_bg_leftBottom"></span>
+            <span class="border_bg_rightBottom"></span>
+          </div>
+        </div>
+        <div class="leftMain_middle_right">
+          <div class="leftMain_middle_rightIn">
+            <h3>委托机构当月送检标本占比</h3>
+            <div class="biaoge biaoge_pai">
+              <div class="biaoge_paiIn">
+                <ul>
+                  <!-- <Vue3SeamlessScroll :list="listData" :step="0.5 as any" :hover="true as any" :key="listData.length"
+                    :limitMoveNum="14"> -->
+                  <li v-for="(item, i) in listData">
+                    <div class="liIn">
+                      <div class="liIn_left"><span class="zi">{{ item.groupname }}</span></div>
+                      <div class="liIn_line">
+                        <div class="line_lineIn" :style="{ width: ` ${item.percentage}` }">
+                          <div class="per">{{ item.percentage }}</div>
+                        </div>
+                      </div>
+                      <p class="num">{{ item.groupsum }}</p>
+                    </div>
+                  </li>
+                  <!-- </Vue3SeamlessScroll> -->
+                </ul>
+              </div>
+            </div>
+
+            <span class="border_bg_leftTop"></span>
+            <span class="border_bg_rightTop"></span>
+            <span class="border_bg_leftBottom"></span>
+            <span class="border_bg_rightBottom"></span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="rightMain">
+      <div class="rightMain_top">
+        <div class="rightMain_topIn">
+          <h3>当日送检样本情况</h3>
+          <div class="biaoge" style="width:100%; height:35vh" ref="chartmain_bing" id="chartmain_bing"></div>
+          <span class="border_bg_leftTop"></span>
+          <span class="border_bg_rightTop"></span>
+          <span class="border_bg_leftBottom"></span>
+          <span class="border_bg_rightBottom"></span>
+        </div>
+      </div>
+      <div class="rightMain_bottom">
+        <div class="rightMain_bottomIn">
+          <h3>送检项目分类占比</h3>
+          <div class="biaoge biaoge_list" ref="sjRef" style="width:100%; height:34vh">
+
+          </div>
+          <span class="border_bg_leftTop"></span>
+          <span class="border_bg_rightTop"></span>
+          <span class="border_bg_leftBottom"></span>
+          <span class="border_bg_rightBottom"></span>
+        </div>
+      </div>
+    </div>
+    <div style="clear:both;"></div>
+  </div>
+
+</template>
+
+<script setup lang="ts">
+import * as echarts from 'echarts';
+import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
+import { getallcount } from '@/api/regional'
+
+const source = ref([
+  { name: '区域机构', num: 0, unit: '家', pre: 'jgs' },
+  { name: '检验人数', num: 0, unit: '人', pre: 'rs' },
+  { name: '检验管数', num: 0, unit: '个', pre: 'gs' },
+  { name: '检验报告数', num: 0, unit: '份', pre: 'bgs' },
+  { name: '检验项目数', num: 0, unit: '个', pre: 'xms' },
+])
+
+const listData: any = ref([])
+
+
+const chartmain = ref()
+const getEcharts1 = (data: any) => {
+  const Intance = echarts.init(chartmain.value);
+  var dataAxis = data.map((item: any) => item.daynum + '日')
+  var data = data.map((item: any) => item.sl)
+  const option = {
+    title: {
+      text: '',
+      subtext: ''
+    },
+    grid: {
+      x: 40,
+      y: 40,
+      x2: 20,
+      y2: 50,
+    },
+    tooltip: {
+      trigger: 'axis'
+    },
+    xAxis: {
+      data: dataAxis,
+      axisLabel: {
+        /*inside: true,*/
+        interval: 0,
+        color: '#fff',
+        fontSize: 12
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: 12,
+        lineStyle: {
+          color: '#fff',
+        }
+      },
+      lineStyle: {
+        color: '#fff',
+      },
+      z: 10
+    },
+    dataZoom: [{
+      type: 'slider',
+      show: true, //flase直接隐藏图形
+      xAxisIndex: [0],
+      textStyle: {
+        color: '#0efdff', // 文字颜色（如白色，根据主题调整）
+        fontSize: 12, // 文字大小
+        fontWeight: 'normal' // 文字粗细
+      },
+      left: '9%', //滚动条靠左侧的百分比
+      bottom: 0,
+      start: 0,//滚动条的起始位置
+      end: 70 //滚动条的截止位置（按比例分割你的柱状图x轴长度）
+    }],
+    yAxis: {
+      type: 'value',
+      name: '单位：个',
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: 12,
+        lineStyle: {
+          color: '#fff',
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        color: '#fff',
+        fontSize: 12
+
+      }
+    },
+
+
+    series: [
+      {
+        type: 'bar',
+        itemStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0, 0, 0, 1,
+            [
+              { offset: 0, color: '#0efdff' },
+              { offset: 0.5, color: '#188df0' },
+              { offset: 1, color: '#188df0' }
+            ]
+          )
+        },
+        emphasis: {
+          itemStyle: {
+            color: new echarts.graphic.LinearGradient(
+              0, 0, 0, 1,
+              [
+                { offset: 0, color: '#2378f7' },
+                { offset: 0.7, color: '#2378f7' },
+                { offset: 1, color: '#0efdff' }
+              ]
+            )
+          }
+        },
+        data: data
+      }
+    ]
+  };
+  Intance.setOption(option);
+}
+const chartmain_bing = ref()
+const getEcharts2 = (data: any) => {
+  const names = data.map((item: any) => item.name)
+  const Intance = echarts.init(chartmain_bing.value);
+  const option = {
+    title: {
+      text: '数据情况统计',
+      subtext: '',
+      left: 'right',
+      textStyle: {
+        color: '#fff',
+        fontSize: 12
+      }
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: '{b} : {c} ({d}%)'
+    },
+    legend: {
+      // orient: 'vertical',
+      // top: 'middle',
+      type: 'scroll',
+      orient: 'vertical',
+      right: 10,
+      top: 40,
+      bottom: 20,
+      left: 'right',
+      data: names,
+      textStyle: {
+        color: '#fff',
+        fontSize: 12
+      }
+
+    },
+    grid: {
+      x: '-10%',
+      y: 40,
+      x2: 20,
+      y2: 20,
+    },
+    color: ['#09d0fb', '#f88cfb', '#95f8fe', '#f9f390', '#ecfeb7'],
+    series: [
+      {
+        type: 'pie',
+        radius: '65%',
+        center: ['45%', '50%'],
+        selectedMode: 'single',
+        data: data,
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ]
+  };
+
+  Intance.setOption(option);
+}
+
+const chartmain_zhe = ref()
+const getEcharts3 = () => {
+  const Intance = echarts.init(chartmain_zhe.value);
+  const xData = listData.value[0].dayline.map((item: any) => item.daynum + '日')
+  const tooltips = listData.value.map((item: any) => item.groupname)
+  const colors = ['#ff7f50', '#87cefa', '#da70d6', '#32cd32', '#6495ed', '#ff69b4', '#ba55d3', '#cd5c5c', '#ffa500', '#40e0d0',
+    '#1e90ff', '#ff6347', '#7b68ee', '#d0648a', '#ffd700', '#6b8e23', '#4ea397', '#3cb371', '#b8860b']
+  const arr = listData.value.map((item: any, i: number) => {
+    return {
+      name: item.groupname,
+      type: 'line',
+      data: item.dayline.map((v: any) => v.sl),
+      itemStyle: {
+        color: colors[i],
+      },
+      lineStyle: {
+        color: colors[i],
+        width: 2,
+      }
+    }
+  })
+  const option = {
+    title: {
+      text: ''
+    },
+    tooltip: {
+      trigger: 'axis', // 或 'item'，根据图表类型选择
+    },
+    legend: {
+      type: 'scroll', // 开启滚动
+      textStyle: {
+        color: '#fff', // 文字颜色（保持与你的主题一致）
+        fontSize: 12
+      },
+      // 滚动箭头样式（兼容写法）
+      pageIcon: 'circle', // 箭头形状（可选：'arrow'/'circle'等）
+      pageIconColor: '#0efdff', // 箭头颜色（核心配置，替代pageButtonItemStyle）
+      pageIconSize: 12, // 箭头大小
+      pageIconInactiveColor: '#666666', // 首尾不可滚动时的箭头颜色
+      pageTextStyle: {
+        color: '#0efdff' // 分页文字颜色（若显示数字分页）
+      },
+      data: tooltips
+    },
+    grid: {
+      x: 40,
+      y: 40,
+      x2: 20,
+      y2: 50,
+    },
+    toolbox: {
+      feature: {
+        //saveAsImage: {}
+      }
+    },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      axisLabel: {
+        /*inside: true,*/
+        interval: 0,
+        color: '#fff',
+        fontSize: 12
+
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: 12,
+        lineStyle: {
+          color: '#fff',
+        }
+      },
+      data: xData
+    },
+
+    dataZoom: [{
+      type: 'slider',
+      show: true, //flase直接隐藏图形
+      xAxisIndex: [0],
+      textStyle: {
+        color: '#0efdff', // 文字颜色（如白色，根据主题调整）
+        fontSize: 12, // 文字大小
+        fontWeight: 'normal' // 文字粗细
+      },
+      left: '9%', //滚动条靠左侧的百分比
+      bottom: 0,
+      start: 0,//滚动条的起始位置
+      end: 70 //滚动条的截止位置（按比例分割你的柱状图x轴长度）
+    }],
+    yAxis: {
+      type: 'value',
+
+      axisLine: {
+        show: true,
+        symbol: ['none', 'arrow'],
+        symbolOffset: 12,
+        lineStyle: {
+          color: '#fff',
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        color: '#fff',
+        fontSize: 12
+
+      }
+    },
+    series: arr
+  };
+
+
+
+
+  Intance.setOption(option);
+}
+
+const sjRef = ref()
+const getEcharts4 = (data: any) => {
+  const names = data.map((item: any) => item.name)
+  const Intance = echarts.init(sjRef.value);
+  const option = {
+    title: {
+      text: '数据情况统计',
+      subtext: '',
+      left: 'right',
+      textStyle: {
+        color: '#fff',
+        fontSize: 12
+      }
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: '{b} : {c} ({d}%)'
+    },
+    legend: {
+      // orient: 'vertical',
+      // top: 'middle',
+      type: 'scroll',
+      orient: 'vertical',
+      right: 10,
+      top: 40,
+      bottom: 20,
+      left: 'right',
+      data: names,
+      textStyle: {
+        color: '#fff',
+        fontSize: 12
+      },
+      // 滚动箭头样式（兼容写法）
+      pageIcon: 'circle', // 箭头形状（可选：'arrow'/'circle'等）
+      pageIconColor: '#0efdff', // 箭头颜色（核心配置，替代pageButtonItemStyle）
+      pageIconSize: 12, // 箭头大小
+      pageIconInactiveColor: '#666666', // 首尾不可滚动时的箭头颜色
+      pageTextStyle: {
+        color: '#0efdff' // 分页文字颜色（若显示数字分页）
+      },
+    },
+    grid: {
+      x: '-10%',
+      y: 40,
+      x2: 20,
+      y2: 20,
+    },
+    color: ['#09d0fb', '#f88cfb', '#95f8fe', '#f9f390', '#ecfeb7'],
+    series: [
+      {
+        type: 'pie',
+        radius: '65%',
+        center: ['45%', '50%'],
+        selectedMode: 'single',
+        data: data,
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ]
+  };
+
+
+  Intance.setOption(option);
+}
+
+
+const getDataInfo = () => {
+  getallcount().then((res: any) => {
+    source.value.forEach(item => {
+      item.num = res.data.regStatAll[item.pre]
+    })
+
+    listData.value = res.data.regStatHospMonth
+    // nextTick(() => {
+    //   // 数据更新后强制重绘
+    //   (document.querySelector('.Vue3SeamlessScroll') as any)?._init();
+    // })
+    const data2 = res.data.regStatStatus.map((item: any) => {
+      return {
+        name: item.dict_name,
+        value: item.sl,
+      }
+    })
+    const data4 = res.data.regStatSample.map((item: any) => {
+      return {
+        name: item.SampleTypeName,
+        value: item.sl,
+      }
+    })
+    getEcharts1(res.data.regStatMonth)
+    getEcharts2(data2)
+    getEcharts3()
+    getEcharts4(data4)
+  })
+}
+
+onMounted(() => {
+  getDataInfo()
+
+
+})
+</script>
+
+<style scoped>
+@import './css/icon.css';
+@import './css/index.css';
+@import './css/public.css';
+</style>
\ No newline at end of file
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 50d8534..4f2e1bc 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,352 +1,295 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="菜单名称" prop="menuName">
-            <el-input
-               v-model="queryParams.menuName"
-               placeholder="请输入菜单名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="菜单名称" prop="menuName">
+        <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable style="width: 200px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="menuId"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      height="calc(100vh - 200px)">
+      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column prop="icon" label="图标" align="center" width="100">
+        <template #default="scope">
+          <svg-icon :icon-class="scope.row.icon" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="status" label="状态" width="80">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" width="160" prop="createTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']">修改</el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+            v-hasPermi="['system:menu:add']">新增</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改菜单对话框 -->
+    <el-dialog :title="title" v-model="open" width="680px" append-to-body>
+      <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="上级菜单">
+              <el-tree-select v-model="form.parentId" :data="menuOptions"
+                :props="{ value: 'menuId', label: 'menuName', children: 'children' }" value-key="menuId"
+                placeholder="选择上级菜单" check-strictly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="菜单类型" prop="menuType">
+              <el-radio-group v-model="form.menuType">
+                <el-radio value="M">目录</el-radio>
+                <el-radio value="C">菜单</el-radio>
+                <el-radio value="F">按钮</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="form.menuType != 'F'">
+            <el-form-item label="菜单图标" prop="icon">
+              <el-popover placement="bottom-start" :width="540" trigger="click">
+                <template #reference>
+                  <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" readonly>
+                    <template #prefix>
+                      <svg-icon v-if="form.icon" :icon-class="form.icon" class="el-input__icon"
+                        style="height: 32px;width: 16px;" />
+                      <el-icon v-else style="height: 32px;width: 16px;">
+                        <search />
+                      </el-icon>
+                    </template>
+                  </el-input>
+                </template>
+                <icon-select ref="iconSelectRef" @selected="selected" :active-icon="form.icon" />
+              </el-popover>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="菜单名称" prop="menuName">
+              <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType != 'F'">
+            <el-form-item>
+              <template #label>
+                <span>
+                  <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>是否外链
+                </span>
+              </template>
+              <el-radio-group v-model="form.isFrame">
+                <el-radio value="0">是</el-radio>
+                <el-radio value="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType != 'F'">
+            <el-form-item prop="path">
+              <template #label>
+                <span>
+                  <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  路由地址
+                </span>
+              </template>
+              <el-input v-model="form.path" placeholder="请输入路由地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType == 'C'">
+            <el-form-item prop="component">
+              <template #label>
+                <span>
+                  <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  组件路径
+                </span>
+              </template>
+              <el-input v-model="form.component" placeholder="请输入组件路径" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType != 'M'">
+            <el-form-item>
+              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
+              <template #label>
+                <span>
+                  <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  权限字符
+                </span>
+              </template>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType == 'C'">
+            <el-form-item>
+              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
+              <template #label>
+                <span>
+                  <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  路由参数
+                </span>
+              </template>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType == 'C'">
+            <el-form-item>
+              <template #label>
+                <span>
+                  <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  是否缓存
+                </span>
+              </template>
+              <el-radio-group v-model="form.isCache">
+                <el-radio value="0">缓存</el-radio>
+                <el-radio value="1">不缓存</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.menuType != 'F'">
+            <el-form-item>
+              <template #label>
+                <span>
+                  <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  显示状态
+                </span>
+              </template>
+              <el-radio-group v-model="form.visible">
+                <el-radio v-for="dict in sys_show_hide" :key="dict.value" :value="dict.value">{{ dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <template #label>
+                <span>
+                  <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
+                    <el-icon><question-filled /></el-icon>
+                  </el-tooltip>
+                  菜单状态
+                </span>
+              </template>
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:menu:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button 
-               type="info"
-               plain
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table
-         v-if="refreshTable"
-         v-loading="loading"
-         :data="menuList"
-         row-key="menuId"
-         :default-expand-all="isExpandAll"
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-         <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-         <el-table-column prop="icon" label="图标" align="center" width="100">
-            <template #default="scope">
-               <svg-icon :icon-class="scope.row.icon" />
-            </template>
-         </el-table-column>
-         <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-         <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="status" label="状态" width="80">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" width="160" prop="createTime">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <!-- 添加或修改菜单对话框 -->
-      <el-dialog :title="title" v-model="open" width="680px" append-to-body>
-         <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
-            <el-row>
-               <el-col :span="24">
-                  <el-form-item label="上级菜单">
-                     <el-tree-select
-                        v-model="form.parentId"
-                        :data="menuOptions"
-                        :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
-                        value-key="menuId"
-                        placeholder="选择上级菜单"
-                        check-strictly
-                     />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="菜单类型" prop="menuType">
-                     <el-radio-group v-model="form.menuType">
-                        <el-radio value="M">目录</el-radio>
-                        <el-radio value="C">菜单</el-radio>
-                        <el-radio value="F">按钮</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item label="菜单图标" prop="icon">
-                     <el-popover
-                        placement="bottom-start"
-                        :width="540"
-                        trigger="click"
-                     >
-                        <template #reference>
-                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" readonly>
-                              <template #prefix>
-                                 <svg-icon
-                                    v-if="form.icon"
-                                    :icon-class="form.icon"
-                                    class="el-input__icon"
-                                    style="height: 32px;width: 16px;"
-                                 />
-                                 <el-icon v-else style="height: 32px;width: 16px;"><search /></el-icon>
-                              </template>
-                           </el-input>
-                        </template>
-                        <icon-select ref="iconSelectRef" @selected="selected" :active-icon="form.icon" />
-                     </el-popover>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="菜单名称" prop="menuName">
-                     <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item prop="routeName">
-                     <template #label>
-                        <span>
-                           <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：因为router会删除名称相同路由，为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           路由名称
-                        </span>
-                     </template>
-                     <el-input v-model="form.routeName" placeholder="请输入路由名称" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item>
-                     <template #label>
-                        <span>
-                           <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>是否外链
-                        </span>
-                     </template>
-                     <el-radio-group v-model="form.isFrame">
-                        <el-radio value="0">是</el-radio>
-                        <el-radio value="1">否</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item prop="path">
-                     <template #label>
-                        <span>
-                           <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           路由地址
-                        </span>
-                     </template>
-                     <el-input v-model="form.path" placeholder="请输入路由地址" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item prop="component">
-                     <template #label>
-                        <span>
-                           <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           组件路径
-                        </span>
-                     </template>
-                     <el-input v-model="form.component" placeholder="请输入组件路径" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'M'">
-                  <el-form-item>
-                     <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
-                     <template #label>
-                        <span>
-                           <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           权限字符
-                        </span>
-                     </template>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item>
-                     <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
-                     <template #label>
-                        <span>
-                           <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           路由参数
-                        </span>
-                     </template>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType == 'C'">
-                  <el-form-item>
-                     <template #label>
-                        <span>
-                           <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           是否缓存
-                        </span>
-                     </template>
-                     <el-radio-group v-model="form.isCache">
-                        <el-radio value="0">缓存</el-radio>
-                        <el-radio value="1">不缓存</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
-                  <el-form-item>
-                     <template #label>
-                        <span>
-                           <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           显示状态
-                        </span>
-                     </template>
-                     <el-radio-group v-model="form.visible">
-                        <el-radio
-                           v-for="dict in sys_show_hide"
-                           :key="dict.value"
-                           :value="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item>
-                     <template #label>
-                        <span>
-                           <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                              <el-icon><question-filled /></el-icon>
-                           </el-tooltip>
-                           菜单状态
-                        </span>
-                     </template>
-                     <el-radio-group v-model="form.status">
-                        <el-radio
-                           v-for="dict in sys_normal_disable"
-                           :key="dict.value"
-                           :value="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
-<script setup lang="ts" name="Menu">
-import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu"
-import SvgIcon from "@/components/SvgIcon/index.vue"
-import IconSelect from "@/components/IconSelect/index.vue"
-import type { SysMenu, MenuQueryParams } from '@/types/api/system/menu'
+<script setup name="Menu">
+import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu";
+import SvgIcon from "@/components/SvgIcon";
+import IconSelect from "@/components/IconSelect";
 
-const { proxy } = getCurrentInstance()
-const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable")
+const { proxy } = getCurrentInstance();
+const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
 
-const menuList = ref<any[]>([])
-const open = ref<boolean>(false)
-const loading = ref<boolean>(true)
-const showSearch = ref<boolean>(true)
-const title = ref<string>("")
-const menuOptions = ref<any[]>([])
-const isExpandAll = ref<boolean>(false)
-const refreshTable = ref<boolean>(true)
-const iconSelectRef = ref<any | null>(null)
+const menuList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const title = ref("");
+const menuOptions = ref([]);
+const isExpandAll = ref(false);
+const refreshTable = ref(true);
+const iconSelectRef = ref(null);
 
 const data = reactive({
-  form: {} as SysMenu,
+  form: {},
   queryParams: {
     menuName: undefined,
     visible: undefined
-  } as MenuQueryParams,
+  },
   rules: {
     menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
     orderNum: [{ required: true, message: "菜单顺序不能为空", trigger: "blur" }],
     path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }]
   },
-})
+});
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams, form, rules } = toRefs(data);
 
 /** 查询菜单列表 */
 function getList() {
-  loading.value = true
+  loading.value = true;
   listMenu(queryParams.value).then(response => {
-    menuList.value = proxy.handleTree(response.data, "menuId")
-    loading.value = false
-  })
+    menuList.value = proxy.handleTree(response.data, "menuId");
+    loading.value = false;
+  });
 }
-
 /** 查询菜单下拉树结构 */
 function getTreeselect() {
-  menuOptions.value = []
+  menuOptions.value = [];
   listMenu().then(response => {
-    const menu = { menuId: 0, menuName: "主类目", children: [] }
-    menu.children = proxy.handleTree(response.data, "menuId")
-    menuOptions.value.push(menu)
-  })
+    const menu = { menuId: 0, menuName: "主类目", children: [] };
+    menu.children = proxy.handleTree(response.data, "menuId");
+    menuOptions.value.push(menu);
+  });
 }
-
 /** 取消按钮 */
 function cancel() {
-  open.value = false
-  reset()
+  open.value = false;
+  reset();
 }
-
 /** 表单重置 */
 function reset() {
   form.value = {
@@ -360,94 +303,85 @@ function reset() {
     isCache: "0",
     visible: "0",
     status: "0"
-  }
-  proxy.resetForm("menuRef")
+  };
+  proxy.resetForm("menuRef");
 }
-
 /** 展示下拉图标 */
 function showSelectIcon() {
-  iconSelectRef.value?.reset()
+  iconSelectRef.value.reset();
 }
-
 /** 选择图标 */
-function selected(name: string) {
-  form.value.icon = name
+function selected(name) {
+  form.value.icon = name;
 }
-
 /** 搜索按钮操作 */
 function handleQuery() {
-  getList()
+  getList();
 }
-
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
-
 /** 新增按钮操作 */
-function handleAdd(row?: SysMenu) {
-  reset()
-  getTreeselect()
+function handleAdd(row) {
+  reset();
+  getTreeselect();
   if (row != null && row.menuId) {
-    form.value.parentId = row.menuId
+    form.value.parentId = row.menuId;
   } else {
-    form.value.parentId = 0
+    form.value.parentId = 0;
   }
-  open.value = true
-  title.value = "添加菜单"
+  open.value = true;
+  title.value = "添加菜单";
 }
-
 /** 展开/折叠操作 */
 function toggleExpandAll() {
-  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
   nextTick(() => {
-    refreshTable.value = true
-  })
+    refreshTable.value = true;
+  });
 }
-
 /** 修改按钮操作 */
-async function handleUpdate(row: SysMenu) {
-  reset()
-  await getTreeselect()
-  getMenu(row.menuId!).then(response => {
-    form.value = response.data!
-    open.value = true
-    title.value = "修改菜单"
-  })
+async function handleUpdate(row) {
+  reset();
+  await getTreeselect();
+  getMenu(row.menuId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改菜单";
+  });
 }
-
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["menuRef"].validate((valid: boolean) => {
+  proxy.$refs["menuRef"].validate(valid => {
     if (valid) {
       if (form.value.menuId != undefined) {
-        updateMenu(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
+        updateMenu(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
       } else {
-        addMenu(form.value).then(() => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+        addMenu(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
       }
     }
-  })
+  });
 }
-
 /** 删除按钮操作 */
-function handleDelete(row: SysMenu) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {
-    return delMenu(row.menuId!)
+function handleDelete(row) {
+  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function () {
+    return delMenu(row.menuId);
   }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
 }
 
-getList()
+getList();
 </script>
diff --git a/vite.config.ts b/vite.config.ts
index 3d7a804..01a0484 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -48,7 +48,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://47.97.125.165:8904',
+          target: 'http://47.97.125.165:8905',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },