diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index e853254..5c146b4 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -97,10 +97,11 @@
       ruleFormRef.value?.clearValidate()
     })
     userForm.value.createUserId = userStore.id
+    userForm.value.createDeptId = userStore.deptId
     userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
-    getUserDept().then((res) => {
-      userForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   userForm.value.createDeptId = res.data.id
+    // })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.value = JSON.parse(JSON.stringify(row))

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index e853254..5c146b4 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -97,10 +97,11 @@
       ruleFormRef.value?.clearValidate()
     })
     userForm.value.createUserId = userStore.id
+    userForm.value.createDeptId = userStore.deptId
     userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
-    getUserDept().then((res) => {
-      userForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   userForm.value.createDeptId = res.data.id
+    // })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 560be02..add6cf0 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -70,11 +70,13 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index e853254..5c146b4 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -97,10 +97,11 @@
       ruleFormRef.value?.clearValidate()
     })
     userForm.value.createUserId = userStore.id
+    userForm.value.createDeptId = userStore.deptId
     userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
-    getUserDept().then((res) => {
-      userForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   userForm.value.createDeptId = res.data.id
+    // })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 560be02..add6cf0 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -70,11 +70,13 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 3f29c46..af0fc44 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -200,10 +200,12 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index e853254..5c146b4 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -97,10 +97,11 @@
       ruleFormRef.value?.clearValidate()
     })
     userForm.value.createUserId = userStore.id
+    userForm.value.createDeptId = userStore.deptId
     userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
-    getUserDept().then((res) => {
-      userForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   userForm.value.createDeptId = res.data.id
+    // })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 560be02..add6cf0 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -70,11 +70,13 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 3f29c46..af0fc44 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -200,10 +200,12 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 9294588..494a317 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -104,10 +104,12 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {

diff --git a/.env.production b/.env.production
index b413207..42e6649 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@
 VITE_APP_TITLE = 计量信息系统
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
+# VITE_APP_API_BASEURL = http://192.168.1.200:5909
+# VITE_METER_API_BASEURL = http://192.168.1.200:5910
 VITE_APP_API_BASEURL = http://111.198.10.15:21611
 VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
diff --git a/public/config/config.json b/public/config/config.json
index f5f204f..4e81ae5 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.100:5909",
-  "baseUrlBusiness": "http://192.168.8.100:5910",
+  "baseUrl": "http://111.198.10.15:21611",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/system/resource.ts b/src/api/system/resource.ts
index 3b3d55c..7b5c3be 100644
--- a/src/api/system/resource.ts
+++ b/src/api/system/resource.ts
@@ -1,9 +1,10 @@
-import request from '../index'
+// import request from '../index'
+import request1 from '../request'
 const prefix = 'sys'
 
 // 资源查询
 export function getResourceList(params: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/list`,
     method: 'get',
     params,
@@ -11,7 +12,7 @@
 }
 // 资源查询
 export function getResourceListByRole(roleId: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/treeListByRoleId`,
     method: 'get',
     params: {
@@ -21,7 +22,7 @@
 }
 // 资源树列表
 export function getResourceTreeList() {
-  return request({
+  return request1({
     url: `${prefix}/resource/tree`,
     method: 'get',
   })
@@ -29,7 +30,7 @@
 
 // 资源类型列表
 export function getResourceTypeList() {
-  return request({
+  return request1({
     url: `${prefix}/dict/code/resourceType`,
     method: 'get',
   })
@@ -37,7 +38,7 @@
 
 // 添加资源
 export function addResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/add`,
     method: 'post',
     data,
@@ -45,7 +46,7 @@
 }
 // 修改资源
 export function updateResource(data: object) {
-  return request({
+  return request1({
     url: `${prefix}/resource/update`,
     method: 'post',
     data,
@@ -53,7 +54,7 @@
 }
 // 删除资源
 export function delResource(id: string) {
-  return request({
+  return request1({
     url: `${prefix}/resource/delete`,
     method: 'post',
     data: {
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index c88bb78..d1ac53c 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -41,7 +41,6 @@
     const params = `?token=${token}`
     console.log(system.url + params)
     window.open(system.url + params)
-    // window.open(`http://127.0.0.1:9526${params}`)
   }
   else {
     localStorage.setItem('currentSys', JSON.stringify({ name: system.name, code: system.code }))
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
index a7a0ccf..fab17c3 100644
--- a/src/views/system/expire/edit.vue
+++ b/src/views/system/expire/edit.vue
@@ -95,11 +95,13 @@
     data.value.createUserId = userStore.id
     data.value.createUserName = userStore.name
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      // fullName
-      data.value.createDeptId = res.data.id
-      data.value.createDeptName = res.data.fullName
-    })
+    data.value.createDeptId = userStore.deptId
+    data.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   // fullName
+    //   data.value.createDeptId = res.data.id
+    //   data.value.createDeptName = res.data.fullName
+    // })
   }
   else {
     data.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/MeasurementBusiness/review/components/edit.vue b/src/views/tested/MeasurementBusiness/review/components/edit.vue
index 2c2f7cf..61b02df 100644
--- a/src/views/tested/MeasurementBusiness/review/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/edit.vue
@@ -1,6 +1,6 @@
 <!-- 要求、委托书及合同评审表-详情 -->
 <script lang="ts" setup name="ReviewDetail">
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, type FormInstance, type FormRules, type UploadUserFile } from 'element-plus'
 import fileView from './fileView.vue'
 import approvalDialog from './ApprovalDialog.vue'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/review'
@@ -42,6 +42,7 @@
 }
 // 打印
 const print = () => {
+  ElMessage.warning('打印中')
   printPage({ id: $route.query.id, pdf: true }).then((res) => {
     printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
   })
diff --git a/src/views/tested/MeasurementBusiness/review/components/fileView.vue b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
index 27133e5..cb71767 100644
--- a/src/views/tested/MeasurementBusiness/review/components/fileView.vue
+++ b/src/views/tested/MeasurementBusiness/review/components/fileView.vue
@@ -13,14 +13,16 @@
   },
 })
 const pdfUrl = ref('')
+const loading = ref(true)
 /**
 * 初始化审批弹窗
 * @param printFileName 文件名
 */
 function init() {
   printPage({ id: props.id, pdf: true }).then((res) => {
-    const base64 = getBase64(res.data).then((res) => {
-      pdfUrl.value = res
+    loading.value = false
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as any
     })
     // pdfUrl.value =
     // console.log(`${import.meta.env.VITE_APP_API_BASEURL}/${res.data}`)
@@ -35,7 +37,7 @@
 
 <template>
   <!-- pdf预览 -->
-  <div style="margin: 0 auto;">
+  <div v-loading="loading" style="margin: 0 auto;">
     <vue-pdf-embed id="print-page" ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
   </div>
 </template>
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
index 7d51b30..93850d4 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCom.vue
@@ -212,12 +212,10 @@
   const option = buildOption()
   timer.value = setInterval(() => {
     if (option.dataZoom[0].endValue == props.seriesData[0].data.length - 1) {
-      console.log('归零')
       option.dataZoom[0].endValue = 5
       option.dataZoom[0].startValue = 0
     }
     else {
-      console.log('切换')
       option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
       option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
     }
diff --git a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
index 2931e99..aa4287a 100644
--- a/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
+++ b/src/views/tested/dashboard/components/BarChartHorizontalCustom.vue
@@ -171,7 +171,6 @@
 function refreshChart() {
   if (chart) {
     const option = buildOption()
-    console.log(option, 'optionoption')
     chart.setOption(option as unknown as ECBasicOption, true)
   }
 }
diff --git a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
index e57b3ec..8713f07 100644
--- a/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
+++ b/src/views/tested/dashboard/components/BarChartVerticalCircle.vue
@@ -404,7 +404,6 @@
 })
 
 onMounted(() => {
-  console.log('optionoption')
   initChart()
 })
 </script>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index 36f291b..28af38d 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -54,7 +54,7 @@
       </div>
     </div>
   </div>
-  <el-empty v-else description="暂无数据" :image-size="100" />
+  <el-empty v-else style="margin: 0 auto;" description="暂无数据" :image-size="50" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index 018991d..bd278e2 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -33,7 +33,6 @@
   blockHeight.value = bodyHeight > 610 ? (bodyHeight) / 3 : 300
   smallBlockHeight.value = bodyHeight > 610 ? (bodyHeight) / 4 : 215
   blockWidth.value = (document.body.clientWidth - 180 - 20 - 20) / 3
-  console.log(blockHeight.value, blockWidth.value - 20)
   benchDivHeight.value = blockHeight.value - 60
 }
 // -----------------------------------日历--------------------------------------------
@@ -69,8 +68,6 @@
     timeObj[item] = []
   })
   getCalendarList(paramas).then((res) => {
-    console.log(res.data, '日历')
-    console.log(timeObj, 'timeObj')
     redCircleData.value = res.data.forEach((item: any) => {
       for (const i in timeObj) {
         if (i === item.markDate) {
@@ -103,7 +100,6 @@
     },
   )
     .then(() => {
-      console.log(selectDateRecord.value)
       for (const i in redCircleData.value) {
         if (selectDateRecord.value === i && redCircleData.value[i].length) {
           delSchedule({ id: redCircleData.value[i][0].id }).then((res) => {
@@ -134,7 +130,6 @@
 const fetchMeasureDetail = () => {
   measureDetailLoading.value = true
   getMeasureDetail().then((res) => {
-    console.log(res.data, 'aaa')
     measureDetailMonthCount.value = res.data.yearToCheck
     measureDetailYearCount.value = res.data.yearChecked
   })
@@ -182,13 +177,11 @@
 const fecthDeviceDetail = (id: string) => {
   // 获取设备类型
   getDeviceType({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备类型')
     TypeData.value = res.data.map((item: any) => item.count)
     TypeXData.value = res.data.map((item: any) => item.name)
   })
   // 设备状态
   getDeviceStatus({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备状态')
     StatusData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -198,7 +191,6 @@
   })
   // 设备分类
   getDeviceClassify({ deptIds: id }).then((res) => {
-    console.log(res.data, '设备分类')
     ClassifyData.value = res.data.map((item: any) => {
       return {
         name: item.name,
@@ -286,9 +278,8 @@
 const scrollTable = ref()
 const scrolltimer = ref()
 // 设置自动滚动
-const autoScroll = (stop: boolean) => {
+const autoScroll = (stop: boolean, list: any[]) => {
   const table = scrollTable.value
-  console.log(table, 'tabletabletable')
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
 
@@ -299,26 +290,31 @@
     scrolltimer.value = null
   }
   else {
-    scrolltimer.value = window.setInterval(() => {
+    if (list.length < 5 && stop) {
+      return
+    }
+    if (divData) {
+      scrolltimer.value = window.setInterval(() => {
       // divData.style.transition = 'all 1s'
       // 元素自增距离顶部1像素
-      divData.scrollTop += 1
-      // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-      if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
+        divData.scrollTop += 1
+        // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+        if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
         // 重置table距离顶部距离
-        divData.scrollTop = 0
+          divData.scrollTop = 0
         // 重置table距离顶部距离。值=(滚动到底部时，距离顶部的大小) - 整个高度/2
         // divData.scrollTop = divData.scrollTop - divData.scrollHeight / 2
-      }
-    }, 100) // 滚动速度
+        }
+      }, 100) // 滚动速度
+    }
   }
 }
 // 设备态势分析-在检
-const inCheckStatisticData = ref()
+const inCheckStatisticData = ref([])
 // 部门排行 - 在检
-const inCheckDeptSeriesData = ref()
+const inCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 在检
-const inCheckDeptAxisData = ref()
+const inCheckDeptAxisData = ref([])
 // 设备列表 - 在检
 const inCheckTable = ref()
 const inCheckTableColumns = ref([
@@ -331,24 +327,23 @@
 //  { width: 1, data: [22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22] }]"
 //  :y-axis-data="['data1-1-9', 'data2-2-13', 'data3-3-15', 'data4-4-19', '
 // 设备态势分析-待检
-const toCheckStatisticData = ref()
+const toCheckStatisticData = ref([])
 // 部门排行 - 待检
-const toCheckDeptSeriesData = ref()
+const toCheckDeptSeriesData = ref<any[]>([])
 // 部门排行 - 待检
-const toCheckDeptAxisData = ref()
+const toCheckDeptAxisData = ref([])
 // 设备列表 - 待检
-const toCheckTable = ref()
+const toCheckTable = ref([])
 // 设备态势 - 在用
-const inUseStatisticData = ref()
-const inUseSeriesData = ref()
-const inUseYAxisData = ref()
-const inUseData = ref()
-const inUseXAxisData = ref()
+const inUseStatisticData = ref([])
+const inUseSeriesData = ref([])
+const inUseYAxisData = ref([])
+const inUseData = ref([])
+const inUseXAxisData = ref([])
 // 获取设备状态数据
 const fecthDeviceStatus = (id: string) => {
   // 在检设备
   inCheckInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '在检设备')
     const data = res.data
     // 设备态势分析
     inCheckStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
@@ -409,7 +404,6 @@
   })
   // 再用设备
   inUseInfo({ deptIds: id }).then((res) => {
-    console.log(res.data, '再用设备')
     const data = res.data
     inUseStatisticData.value = data.statistic.map((item: any) => ({ name: item.name, value: item.count }))
     inUseSeriesData.value = data.nameAggrList.map((item: any) => item.count)
@@ -468,11 +462,15 @@
     const day = dayjs(calendarValue.value).format('YYYY-MM')
     clickDate(day)
   })
-  autoScroll(false)
+  autoScroll(false, [])
   // ------------------------------------------------------------------------------
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
 })
 onBeforeUnmount(() => {
-  autoScroll(true)
+  autoScroll(true, [])
 })
 </script>
 
@@ -587,11 +585,14 @@
 
           <div :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 设备分类分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <pie-chart v-show="ClassifyData.length" style="width: 33%; height: 100%;" title="设备分类分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="ClassifyData" :radius="['70%']" />
+            <el-empty v-show="!ClassifyData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备状态分析 -->
-            <pie-chart style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <pie-chart v-show="StatusData.length" style="width: 33%; height: 100%;" title="设备状态分析" label-position="outside" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="StatusData" :radius="['70%']" />
+            <el-empty v-show="!StatusData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 设备类型分析 -->
-            <bar-chart-vertical-com style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <bar-chart-vertical-com v-show="TypeData.length" style="width: 33%; height: 100%;" title="设备类型分析" :width="`${(blockWidth * 2) / 3 - 10}px`" :legend="{ show: false }" :data="TypeData" :x-axis-data="TypeXData" />
+            <el-empty v-show="!TypeData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
         <bench-col
@@ -631,23 +632,26 @@
           <!-- 在检设备 -->
           <div :class="`${showDevice === 0 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="inCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
+              v-show="inCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inCheckDeptSeriesData" :y-axis-data="inCheckDeptAxisData"
             />
+            <el-empty v-show="!inCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="inCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, inCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -662,23 +666,26 @@
           </div>
           <div :class="`${showDevice === 1 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <pie-chart v-show="toCheckStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="toCheckStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!toCheckStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 部门排行榜 -->
             <bar-chart-horizontal-com
-              style="width: 33%;  height: 100%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
+              v-show="toCheckDeptAxisData.length"
+              style="width: 33%;  height: 97%;" title="部门排行榜" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="toCheckDeptSeriesData" :y-axis-data="toCheckDeptAxisData"
             />
+            <el-empty v-show="!toCheckDeptAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
             <!-- 在检设备列表 -->
             <el-table
               ref="scrollTable"
               :data="toCheckTable"
-              style="width: 32%;  height: 100%;"
+              style="width: 31%;  height: 100%;"
               :height="blockHeight - 65 - 20"
               stripe
               header-row-class-name="bench-table-header"
               row-class-name="bench-table-row"
               class="bench-table"
-              @mouseenter="autoScroll(true)"
-              @mouseleave="autoScroll(false)"
+              @mouseenter="autoScroll(true, [])"
+              @mouseleave="autoScroll(false, toCheckTable)"
             >
               <el-table-column
                 v-for="item in inCheckTableColumns"
@@ -693,9 +700,12 @@
           </div>
           <div :class="`${showDevice === 2 ? '' : 'none'}`" :style="`height:${blockHeight - 65}px`" class="device-container">
             <!-- 检定设备态势 -->
-            <pie-chart style="width: 33%; height: 100%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
-            <bar-chart-vertical-custom style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
-            <bar-chart-vertical-circle style="width: 33%; height: 100%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <pie-chart v-show="inUseStatisticData.length" style="width: 33%; height: 97%;" title="检定设备态势" :legend="Devicelegend" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseStatisticData" :radius="['70%', '50%']" />
+            <el-empty v-show="!inUseStatisticData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-custom v-show="inUseYAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :series-data="inUseSeriesData" :y-axis-data="inUseYAxisData" />
+            <el-empty v-show="!inUseYAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
+            <bar-chart-vertical-circle v-show="inUseXAxisData.length" style="width: 33%; height: 97%;" :width="`${(blockWidth * 2) / 3 - 10}px`" :data="inUseData" :x-axis-data="inUseXAxisData" />
+            <el-empty v-show="!inUseXAxisData.length" style="margin: 0 auto;" description="暂无数据" :image-size="50" />
           </div>
         </bench-col>
       </div>
@@ -842,7 +852,7 @@
   display: flex;
   justify-content: space-around;
   position: absolute;
-  width: 100%;
+  width: 98% !important;
 }
 
 .calendar {
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
index 154b6b4..891c07b 100644
--- a/src/views/tested/device/model/components/edit.vue
+++ b/src/views/tested/device/model/components/edit.vue
@@ -53,10 +53,11 @@
   if ($route.params.type === 'create') {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
+    ruleForm.value.createDeptId = userStore.deptId
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    // })
   }
   else {
     console.log($route.query.row, 'data')
diff --git a/src/views/tested/device/task/addDialog.vue b/src/views/tested/device/task/addDialog.vue
index e853254..5c146b4 100644
--- a/src/views/tested/device/task/addDialog.vue
+++ b/src/views/tested/device/task/addDialog.vue
@@ -97,10 +97,11 @@
       ruleFormRef.value?.clearValidate()
     })
     userForm.value.createUserId = userStore.id
+    userForm.value.createDeptId = userStore.deptId
     userForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
-    getUserDept().then((res) => {
-      userForm.value.createDeptId = res.data.id
-    })
+    // getUserDept().then((res) => {
+    //   userForm.value.createDeptId = res.data.id
+    // })
   }
   else if (dialogStatus.value === 'update') { // 如果是修改，将row中数据填写到输入框中
     userForm.value = JSON.parse(JSON.stringify(row))
diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue
index 560be02..add6cf0 100644
--- a/src/views/tested/subpackage/certificate/components/edit.vue
+++ b/src/views/tested/subpackage/certificate/components/edit.vue
@@ -70,11 +70,13 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
     // 获取当前用户所在单位
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index 3f29c46..af0fc44 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -200,10 +200,12 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/src/views/tested/subpackage/review/components/edit.vue b/src/views/tested/subpackage/review/components/edit.vue
index 9294588..494a317 100644
--- a/src/views/tested/subpackage/review/components/edit.vue
+++ b/src/views/tested/subpackage/review/components/edit.vue
@@ -104,10 +104,12 @@
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
-    getUserDept().then((res) => {
-      ruleForm.value.createDeptId = res.data.id
-      ruleForm.value.createDeptName = res.data.fullName
-    })
+    ruleForm.value.createDeptId = userStore.deptId
+    ruleForm.value.createDeptName = userStore.deptName
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
diff --git a/vite.config.ts b/vite.config.ts
index 921d4d9..19c4b81 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,11 +39,11 @@
     build: {
       outDir: mode === 'production' ? 'dist' : `dist-${mode}`,
       sourcemap: env.VITE_BUILD_SOURCEMAP === 'true',
-      // rollupOptions: {
-      //   external: [
-      //     'pdfjs-dist',
-      //   ],
-      // },
+      rollupOptions: {
+        external: [
+          // 'pdfjs-dist',
+        ],
+      },
     },
     define: {
       __SYSTEM_INFO__: JSON.stringify({