diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 618d36f..e9ff0ce 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -16,7 +16,7 @@
   preparationDate: null,
   id: null,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -27,43 +27,36 @@
   {
     text: '标准代码',
     value: 'standardNo',
-    width: '120',
     align: 'center',
   },
   {
     text: '标准名称',
     value: 'standardName',
-    width: '90',
     align: 'center',
   },
   {
     text: '类别',
     value: 'categoryName',
-    width: '80',
     align: 'center',
   },
   {
     text: '标准等级',
     value: 'standardLevelName',
-    width: '100',
     align: 'center',
   },
   {
     text: '传递范围',
     value: 'transmitRange',
-    width: '110',
     align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
-    width: '100',
     align: 'center',
   },
   {
     text: '标准所在部门',
     value: 'standardLaboratoryName',
-    width: '120',
     align: 'center',
   },
   {
@@ -74,13 +67,12 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '110',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
     align: 'center',
   },
 ])
@@ -350,7 +342,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="180">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 618d36f..e9ff0ce 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -16,7 +16,7 @@
   preparationDate: null,
   id: null,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -27,43 +27,36 @@
   {
     text: '标准代码',
     value: 'standardNo',
-    width: '120',
     align: 'center',
   },
   {
     text: '标准名称',
     value: 'standardName',
-    width: '90',
     align: 'center',
   },
   {
     text: '类别',
     value: 'categoryName',
-    width: '80',
     align: 'center',
   },
   {
     text: '标准等级',
     value: 'standardLevelName',
-    width: '100',
     align: 'center',
   },
   {
     text: '传递范围',
     value: 'transmitRange',
-    width: '110',
     align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
-    width: '100',
     align: 'center',
   },
   {
     text: '标准所在部门',
     value: 'standardLaboratoryName',
-    width: '120',
     align: 'center',
   },
   {
@@ -74,13 +67,12 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '110',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
     align: 'center',
   },
 ])
@@ -350,7 +342,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="180">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 639fe16..fe9cf57 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -12,7 +12,7 @@
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -20,7 +20,7 @@
 const list = ref([])
 const { proxy } = getCurrentInstance() as any
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
 const columns = ref([
   {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 618d36f..e9ff0ce 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -16,7 +16,7 @@
   preparationDate: null,
   id: null,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -27,43 +27,36 @@
   {
     text: '标准代码',
     value: 'standardNo',
-    width: '120',
     align: 'center',
   },
   {
     text: '标准名称',
     value: 'standardName',
-    width: '90',
     align: 'center',
   },
   {
     text: '类别',
     value: 'categoryName',
-    width: '80',
     align: 'center',
   },
   {
     text: '标准等级',
     value: 'standardLevelName',
-    width: '100',
     align: 'center',
   },
   {
     text: '传递范围',
     value: 'transmitRange',
-    width: '110',
     align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
-    width: '100',
     align: 'center',
   },
   {
     text: '标准所在部门',
     value: 'standardLaboratoryName',
-    width: '120',
     align: 'center',
   },
   {
@@ -74,13 +67,12 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '110',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
     align: 'center',
   },
 ])
@@ -350,7 +342,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="180">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 639fe16..fe9cf57 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -12,7 +12,7 @@
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -20,7 +20,7 @@
 const list = ref([])
 const { proxy } = getCurrentInstance() as any
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
 const columns = ref([
   {
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9b3a9a6..c8ba746 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -7,6 +7,7 @@
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 import { validatePhone } from '@/utils/validate'
@@ -88,7 +89,6 @@
   editable: true,
 }
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
-const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
@@ -245,56 +245,33 @@
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
   fileContent: '',
 })
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 双击行显示输入框
 const dblclickRow = (row: traceSupplierPerson) => {
@@ -638,27 +615,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template v-if="buttonType !== '详情'" #btns>
+      <template v-if="pageType !== 'detail'" #btns>
         <el-button type="info" @click="deleteList">
           删除行
         </el-button>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 618d36f..e9ff0ce 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -16,7 +16,7 @@
   preparationDate: null,
   id: null,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -27,43 +27,36 @@
   {
     text: '标准代码',
     value: 'standardNo',
-    width: '120',
     align: 'center',
   },
   {
     text: '标准名称',
     value: 'standardName',
-    width: '90',
     align: 'center',
   },
   {
     text: '类别',
     value: 'categoryName',
-    width: '80',
     align: 'center',
   },
   {
     text: '标准等级',
     value: 'standardLevelName',
-    width: '100',
     align: 'center',
   },
   {
     text: '传递范围',
     value: 'transmitRange',
-    width: '110',
     align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
-    width: '100',
     align: 'center',
   },
   {
     text: '标准所在部门',
     value: 'standardLaboratoryName',
-    width: '120',
     align: 'center',
   },
   {
@@ -74,13 +67,12 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '110',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
     align: 'center',
   },
 ])
@@ -350,7 +342,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="180">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 639fe16..fe9cf57 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -12,7 +12,7 @@
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -20,7 +20,7 @@
 const list = ref([])
 const { proxy } = getCurrentInstance() as any
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
 const columns = ref([
   {
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9b3a9a6..c8ba746 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -7,6 +7,7 @@
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 import { validatePhone } from '@/utils/validate'
@@ -88,7 +89,6 @@
   editable: true,
 }
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
-const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
@@ -245,56 +245,33 @@
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
   fileContent: '',
 })
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 双击行显示输入框
 const dblclickRow = (row: traceSupplierPerson) => {
@@ -638,27 +615,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template v-if="buttonType !== '详情'" #btns>
+      <template v-if="pageType !== 'detail'" #btns>
         <el-button type="info" @click="deleteList">
           删除行
         </el-button>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 2e2ed80..5f4180b 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -12,7 +12,7 @@
   effectiveCompany: '',
   director: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const checkoutList = ref([])
 const list = ref([])
@@ -52,37 +52,32 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -93,25 +88,22 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '100',
     align: 'center',
   },
 ])
@@ -128,7 +120,7 @@
     effectiveCompany: '',
     director: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
 }
 // 导出
@@ -307,7 +299,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="255">
+            <el-table-column label="操作" align="center" width="190">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index b10742f..d67dab6 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -245,6 +245,45 @@
           auth: '/standard/checkApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'standardListAdd',
+        component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
+        meta: {
+          title: '更换申请申请',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/standard/changeApply',
+        },
+        beforeEnter: (to, from, next) => {
+          const type = from.path.split('/')[from.path.split('/').length - 1]
+          console.log(type)
+          switch (type) {
+            case 'changeApply':
+              to.meta.activeMenu = '/standard/changeApply'
+              to.meta.title = '更换申请'
+              break
+            case 'pauseApply':
+              to.meta.activeMenu = '/standard/pauseApply'
+              to.meta.title = '暂停申请'
+              break
+            case 'cancelApply':
+              to.meta.activeMenu = '/standard/cancelApply'
+              to.meta.title = '撤销申请'
+              break
+            case 'resumeApply':
+              to.meta.activeMenu = '/standard/resumeApply'
+              to.meta.title = '恢复申请'
+              break
+            case 'checkApply':
+              to.meta.activeMenu = '/standard/checkApply'
+              to.meta.title = '复查申请'
+              break
+          }
+          next()
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 45ab796..dca67da 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -39,6 +39,13 @@
     disabled.value = false
   }
 }
+onUnmounted(() => {
+  sessionStorage.setItem(`${props.applyType}Menu`, current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
+})
 </script>
 
 <template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 8000909..242b40e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -10,7 +10,7 @@
 const props = defineProps({
   name: {
     type: String,
-    default: '全部',
+    default: '',
   },
   buttoms: {
     type: Array,
@@ -37,9 +37,11 @@
   organizeNo: '',
   standardName: '',
   standardNo: '',
-  limit: 10,
+  limit: 20,
   offset: 1,
 })
+// 初始化路由
+const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
@@ -195,13 +197,25 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (index: string, row: rowReturn, value: string) => {
+const handleEdit = (row: rowReturn, value: string) => {
   console.log(row)
-  if (value === '查看' || value === '编辑') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-    buttonType.value = value
-    infoId.value = row.id
-    show.value = false
+  if (value === '查看') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+        id: row.id,
+      },
+    })
+  }
+  else if (value === '编辑') {
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'edit',
+        id: row.id,
+      },
+    })
   }
   else if (value === '删除' || value === '取消' || value === '提交') {
     handleDelete(row, value)
@@ -315,9 +329,19 @@
   upload()
 }
 const add = () => {
-  buttonArray.value = ['提交', '保存']
-  buttonType.value = ''
-  show.value = false
+  // buttonArray.value = ['提交', '保存']
+  // buttonType.value = ''
+  // show.value = false
+  $router.push({
+    name: 'standardListAdd',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
+  })
 }
 const exportAll = () => {
   exportExcelBtn()
@@ -416,7 +440,7 @@
                   :key="index"
                   size="small"
                   :type="item.type" link
-                  @click="handleEdit(row.$index, row, item.name)"
+                  @click="handleEdit(row, item.name)"
                 >
                   {{ item.name }}
                 </el-button>
@@ -427,14 +451,6 @@
       </table-container>
     </app-container>
   </div>
-
-  <list-source-add
-    v-else
-    :info-id="infoId"
-    :button-type="buttonType"
-    :button-array="buttonArray"
-    @close="close"
-  />
   <el-dialog
     v-model="applyShow"
     title="审批操作"
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 6b440d0..2b8bef4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -9,21 +9,33 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
-const props = defineProps({
-  infoId: {
-    type: String || Number,
-    default: '',
-  },
-  buttonType: {
-    type: String,
-    default: '',
-  },
-  buttonArray: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['close', 'setData']) // 关闭
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '查看',
+} // 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['提交']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
@@ -115,6 +127,7 @@
   updateTime: '',
   version: '',
 })
+
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
 const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
@@ -280,28 +293,28 @@
 const columnsFiles = ref<columnsType[]>([
   {
     text: '文件名称',
-    value: 'name',
+    value: 'fileName',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '上传时间',
-    value: 'name',
+    value: 'createTime',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '文件说明',
-    value: 'name',
+    value: 'remark',
     align: 'center',
     required: true,
     choose: false,
   },
   {
     text: '附件文档',
-    value: 'name',
+    value: 'minioFileName',
     align: 'center',
     required: true,
     choose: true,
@@ -316,9 +329,12 @@
 const dialogVisible = ref(false)
 // 选择标准装置数据列表下拉框
 const standardList = ref([])
+// 初始化路由
+const $router = useRouter()
 // 关闭
 const close = () => {
-  emit('close')
+  // emit('close')
+  $router.back()
 }
 const rules = ref({
   standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
@@ -367,7 +383,7 @@
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      formInline.value.fileList = res.data
+      fromListInfo.value.fileList[0].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
     }
@@ -400,7 +416,7 @@
 }
 // 增加申请文档列表
 const addRow = () => {
-  filesList.value.push({})
+  fromListInfo.value.fileList.push({})
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
@@ -450,8 +466,8 @@
     formInline.value = res.data
   })
 }
-if (props.buttonType !== '') {
-  getInfo(props.infoId)
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
 }
 
 // 提交
@@ -500,11 +516,6 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  handleClose()
-}
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
@@ -526,7 +537,7 @@
       }
       else {
       // 删除行
-        filesList.value = filesList.value.filter((item) => {
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
@@ -543,7 +554,6 @@
 }
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
-  emit('setData', newVal)
 },
 { deep: true, immediate: true })
 // 审批弹窗的关闭
@@ -564,7 +574,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        基本信息
+        {{ $route.meta.title }} -- {{ textMap[pageType] }}
       </h4>
       <div>
         <el-button
@@ -606,7 +616,7 @@
                 clearable
                 placeholder="标准名称"
                 size="default"
-                :disabled="buttonType === '查看'"
+                :disabled="pageType === 'detail'"
                 @change="standardChange"
               >
                 <el-option
@@ -1068,7 +1078,7 @@
         </span>
       </div>
       <el-table
-        :data="filesList"
+        :data="fromListInfo.fileList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index aa13225..c762b33 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -154,35 +154,28 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.fileList = res.data
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
+const upload = () => {
+  fileRef.value.click()
 }
 const testForm = ref({
   fileList: [],
@@ -608,26 +601,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <!-- <el-row :gutter="20">
           <el-col :span="3">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === 'detail'">
-                  上传
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
-              </el-upload>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 618d36f..e9ff0ce 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -16,7 +16,7 @@
   preparationDate: null,
   id: null,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -27,43 +27,36 @@
   {
     text: '标准代码',
     value: 'standardNo',
-    width: '120',
     align: 'center',
   },
   {
     text: '标准名称',
     value: 'standardName',
-    width: '90',
     align: 'center',
   },
   {
     text: '类别',
     value: 'categoryName',
-    width: '80',
     align: 'center',
   },
   {
     text: '标准等级',
     value: 'standardLevelName',
-    width: '100',
     align: 'center',
   },
   {
     text: '传递范围',
     value: 'transmitRange',
-    width: '110',
     align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
-    width: '100',
     align: 'center',
   },
   {
     text: '标准所在部门',
     value: 'standardLaboratoryName',
-    width: '120',
     align: 'center',
   },
   {
@@ -74,13 +67,12 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '110',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
     align: 'center',
   },
 ])
@@ -350,7 +342,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="180">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 639fe16..fe9cf57 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -12,7 +12,7 @@
   supplierName: '', // 溯源供方名称
   businessContent: '', // 溯源供方编号
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 // 控制是否显示新增页面
 const show = ref(true)
@@ -20,7 +20,7 @@
 const list = ref([])
 const { proxy } = getCurrentInstance() as any
 // 总数
-const total = ref(20)
+const total = ref(0)
 // 表头
 const columns = ref([
   {
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9b3a9a6..c8ba746 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -7,6 +7,7 @@
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 import { validatePhone } from '@/utils/validate'
@@ -88,7 +89,6 @@
   editable: true,
 }
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
-const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
   supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
@@ -245,56 +245,33 @@
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
   fileContent: '',
 })
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  reader.onload = (e) => {
-    testForm.value.fileContent = e.target!.result?.replace(
-      /\n|\r\n/g,
-      '<br/>',
-    )
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
 }
-// 点击文件预览
-const uploadShow = (e: any) => {
-  const URL = window.URL || window.webkitURL
-  window.open(URL.createObjectURL(e.raw))
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      formInline.value.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 双击行显示输入框
 const dblclickRow = (row: traceSupplierPerson) => {
@@ -638,27 +615,18 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button type="primary" :disabled="pageType === 'detail'">
-                  上传
-                </el-button>
-              </el-upload>
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template v-if="buttonType !== '详情'" #btns>
+      <template v-if="pageType !== 'detail'" #btns>
         <el-button type="info" @click="deleteList">
           删除行
         </el-button>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 2e2ed80..5f4180b 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -12,7 +12,7 @@
   effectiveCompany: '',
   director: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const checkoutList = ref([])
 const list = ref([])
@@ -52,37 +52,32 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -93,25 +88,22 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '100',
     align: 'center',
   },
 ])
@@ -128,7 +120,7 @@
     effectiveCompany: '',
     director: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
 }
 // 导出
@@ -307,7 +299,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="255">
+            <el-table-column label="操作" align="center" width="190">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index d8c11ab..1ba43aa 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -12,7 +12,7 @@
   logNo: '',
   trainName: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const checkoutList = ref([])
 const list = ref([])
@@ -55,49 +55,43 @@
   {
     text: '培训名称',
     value: 'trainName',
-    width: '120',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '160',
+    width: '180',
     align: 'center',
   },
   {
     text: '培训地点',
     value: 'trainAddress',
-    width: '100',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '100',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '100',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '100',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '160',
+    width: '180',
     align: 'center',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
     align: 'center',
   },
 ])
@@ -113,7 +107,7 @@
     logNo: '',
     trainName: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
 }
 // 导出