diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 9285675..1cfb494 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -100,11 +100,11 @@
         fetchData(true)
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 9285675..1cfb494 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -100,11 +100,11 @@
         fetchData(true)
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 2c8e6e5..8ca5014 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -3,6 +3,8 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -11,6 +13,7 @@
   },
 })
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
   notifyName: '', // 通知名称
   notifyNo: '', // 通知编号
@@ -20,6 +23,8 @@
   offset: 1,
   limit: 20,
 })
+// 获取当前用户信息
+
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -67,6 +72,10 @@
 
 // 获取数据
 const fetchData = (isNowPage = true) => {
+  // console.log(userStore.id, 'userStore.id')
+  getUserDept().then((res) => {
+    console.log(res.data, 'res')
+  })
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 9285675..1cfb494 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -100,11 +100,11 @@
         fetchData(true)
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 2c8e6e5..8ca5014 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -3,6 +3,8 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -11,6 +13,7 @@
   },
 })
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
   notifyName: '', // 通知名称
   notifyNo: '', // 通知编号
@@ -20,6 +23,8 @@
   offset: 1,
   limit: 20,
 })
+// 获取当前用户信息
+
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -67,6 +72,10 @@
 
 // 获取数据
 const fetchData = (isNowPage = true) => {
+  // console.log(userStore.id, 'userStore.id')
+  getUserDept().then((res) => {
+    console.log(res.data, 'res')
+  })
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index e820337..11d50e7 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -80,7 +80,10 @@
 ])
 const current = ref('baseinfo')
 const apply = (type: string) => {
-  baseRef.value.apply(type)
+  current.value = 'baseinfo'
+  setTimeout(() => {
+    baseRef.value.apply(type)
+  })
 }
 const editForm = () => {
   baseRef.value.editForm()
@@ -131,10 +134,10 @@
       </el-radio-group>
     </detail-block-com>
     <base-info v-show="current === 'baseinfo'" ref="baseRef" class="device-base-info" status="detail" />
-    <report-table v-if="current === 'certificateList'" :data="certificateList" status="detail" />
-    <status-table v-if="current === 'statusChange'" :data="statusList" status="detail" />
-    <roam-table v-if="current === 'logRecord'" :data="logRecord" status="detail" />
-    <approval-record-table-device v-if="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
+    <report-table v-show="current === 'certificateList'" :data="certificateList" status="detail" />
+    <status-table v-show="current === 'statusChange'" :data="statusList" status="detail" />
+    <roam-table v-show="current === 'logRecord'" :data="logRecord" status="detail" />
+    <approval-record-table-device v-show="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
   </app-container>
 </template>
 

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 9285675..1cfb494 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -100,11 +100,11 @@
         fetchData(true)
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 2c8e6e5..8ca5014 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -3,6 +3,8 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -11,6 +13,7 @@
   },
 })
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
   notifyName: '', // 通知名称
   notifyNo: '', // 通知编号
@@ -20,6 +23,8 @@
   offset: 1,
   limit: 20,
 })
+// 获取当前用户信息
+
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -67,6 +72,10 @@
 
 // 获取数据
 const fetchData = (isNowPage = true) => {
+  // console.log(userStore.id, 'userStore.id')
+  getUserDept().then((res) => {
+    console.log(res.data, 'res')
+  })
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index e820337..11d50e7 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -80,7 +80,10 @@
 ])
 const current = ref('baseinfo')
 const apply = (type: string) => {
-  baseRef.value.apply(type)
+  current.value = 'baseinfo'
+  setTimeout(() => {
+    baseRef.value.apply(type)
+  })
 }
 const editForm = () => {
   baseRef.value.editForm()
@@ -131,10 +134,10 @@
       </el-radio-group>
     </detail-block-com>
     <base-info v-show="current === 'baseinfo'" ref="baseRef" class="device-base-info" status="detail" />
-    <report-table v-if="current === 'certificateList'" :data="certificateList" status="detail" />
-    <status-table v-if="current === 'statusChange'" :data="statusList" status="detail" />
-    <roam-table v-if="current === 'logRecord'" :data="logRecord" status="detail" />
-    <approval-record-table-device v-if="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
+    <report-table v-show="current === 'certificateList'" :data="certificateList" status="detail" />
+    <status-table v-show="current === 'statusChange'" :data="statusList" status="detail" />
+    <roam-table v-show="current === 'logRecord'" :data="logRecord" status="detail" />
+    <approval-record-table-device v-show="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 41df464..d17d646 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -387,14 +387,13 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
         loading.close()
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
     })

diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index d2c71be..89c52ea 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -57,7 +57,6 @@
     url: `/equipment/info/import?equipmentType=${deviceType}`,
     method: 'post',
     data,
-    responseType: 'blob',
   })
 }
 // 获取设备详情
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index fb29223..14ec12e 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -114,7 +114,6 @@
 
 // -------------------------------------------钩子------------------------------------------------
 watch(() => props.processId, (val) => {
-  console.log('流程实例id', val)
   listQuery.value.processId = val!
   getDict().then(() => {
     fetchData()
diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
index b9a088c..e690cd6 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue
@@ -79,9 +79,7 @@
       // console.log(approvalLogsList, 'approvalLogsList')
       item.approvalLogsList = approvalLogsList
     })
-    console.log(data, 'data')
     list.value = data
-    console.log()
     // total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -113,7 +111,6 @@
 }
 // 合并单元格
 const objectSpanMethod = ({ row, rowIndex, columnIndex }: { row: any; rowIndex: number; columnIndex: number }) => {
-  console.log(row, 'row')
   if (columnIndex === 0) {
     const _row = (flitterData(list.value[row.cindex].approvalLogsList).one)[rowIndex]
     const _col = _row > 0 ? 1 : 0
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index da0001f..74f5a40 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
+      return hasPermission(permPath) && row.approvalStatusName !== '待审批' && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '审批' && row.approvalStatusName !== '已审批'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 9285675..1cfb494 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -100,11 +100,11 @@
         fetchData(true)
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 2c8e6e5..8ca5014 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -3,6 +3,8 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
 const $props = defineProps({
   // notifyType 通知类型(负责人/部门，字典值)
   notifyType: {
@@ -11,6 +13,7 @@
   },
 })
 const { proxy } = getCurrentInstance() as any
+const userStore = useUserStore()
 const listQuery = reactive({
   notifyName: '', // 通知名称
   notifyNo: '', // 通知编号
@@ -20,6 +23,8 @@
   offset: 1,
   limit: 20,
 })
+// 获取当前用户信息
+
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
@@ -67,6 +72,10 @@
 
 // 获取数据
 const fetchData = (isNowPage = true) => {
+  // console.log(userStore.id, 'userStore.id')
+  getUserDept().then((res) => {
+    console.log(res.data, 'res')
+  })
   listLoading.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index e820337..11d50e7 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -80,7 +80,10 @@
 ])
 const current = ref('baseinfo')
 const apply = (type: string) => {
-  baseRef.value.apply(type)
+  current.value = 'baseinfo'
+  setTimeout(() => {
+    baseRef.value.apply(type)
+  })
 }
 const editForm = () => {
   baseRef.value.editForm()
@@ -131,10 +134,10 @@
       </el-radio-group>
     </detail-block-com>
     <base-info v-show="current === 'baseinfo'" ref="baseRef" class="device-base-info" status="detail" />
-    <report-table v-if="current === 'certificateList'" :data="certificateList" status="detail" />
-    <status-table v-if="current === 'statusChange'" :data="statusList" status="detail" />
-    <roam-table v-if="current === 'logRecord'" :data="logRecord" status="detail" />
-    <approval-record-table-device v-if="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
+    <report-table v-show="current === 'certificateList'" :data="certificateList" status="detail" />
+    <status-table v-show="current === 'statusChange'" :data="statusList" status="detail" />
+    <roam-table v-show="current === 'logRecord'" :data="logRecord" status="detail" />
+    <approval-record-table-device v-show="current === 'approvalList'" :id="$route.query.statusName === '全部' ? JSON.parse($route.query.row as string).id : JSON.parse($route.query.row as string).equipmentId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 41df464..d17d646 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -387,14 +387,13 @@
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
         ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-        console.log(ruleForm.value.instructionsFile, 'ruleForm.value.instructionsFile')
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
         loading.close()
       }
       else {
-        ElMessage.error(res.message)
+        // ElMessage.error(res.message)
         loading.close()
       }
     })
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f65e207..480b6f2 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -294,8 +294,8 @@
         // ElMessage.error(res.message)
         loading.close()
       }
-    }).catch((err) => {
-      ElMessage.error(err.message)
+    }).catch(() => {
+      // ElMessage.error(err.message)
       loading.close()
     })
   }