diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index a4cdd5e..21d9af6 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -195,7 +195,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index a4cdd5e..21d9af6 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -195,7 +195,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index d3c6f81..7cd607b 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index a4cdd5e..21d9af6 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -195,7 +195,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index d3c6f81..7cd607b 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index a2468de..cb77376 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -213,7 +213,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="170">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index a4cdd5e..21d9af6 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -195,7 +195,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index d3c6f81..7cd607b 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index a2468de..cb77376 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -213,7 +213,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="170">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index ac857ea..4a49f38 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="170">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑

diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index f29d997..c5cea4b 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -86,3 +86,29 @@
     data,
   })
 }
+// 保存草稿箱
+export function confirmDrafts(data: object) {
+  return request({
+    url: '/meter/file/save',
+    method: 'post',
+    data,
+  })
+}
+
+// 提交 （ data 为 保存草稿箱接口的返回值）
+export function submitFile(data: object) {
+  return request({
+    url: '/meter/file/submit',
+    method: 'post',
+    data,
+  })
+}
+// 更新草稿箱
+export function updateDrafts(data: object) {
+  return request({
+    url: '/meter/file/draftUpdate',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 31f65c9..dfd8e27 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -81,6 +81,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'standingBookDetail',
+        component: () => import('@/views/device/standingBook/components/templateAdd.vue'),
+        meta: {
+          title: '设备台账',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
+      {
         path: 'fixedAssets',
         name: 'fixedAssets',
         component: () => import('@/views/device/standingBook/fixedAssets.vue'),
@@ -90,6 +102,18 @@
           auth: '/device/fixedAssets',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'fixedAssetsDetail',
+        component: () => import('@/views/device/standingBook/components/fixedAssetsAdd.vue'),
+        meta: {
+          title: '固定资产',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/standingBook',
+        },
+      },
     ],
   },
   {
@@ -236,6 +260,18 @@
           auth: '/device/handleApply',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'stateManageDetail',
+        component: () => import('@/views/device/stateManage/components/templateAdd.vue'),
+        meta: {
+          title: '状态管理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/device/stateManage',
+        },
+      },
     ],
   },
   {
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 59de035..2fc1181 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -90,6 +90,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'measureFileDetail',
+        component: () => import('@/views/measure/file/components/addDialog.vue'),
+        meta: {
+          title: '计量文件',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/file',
+        },
+      },
+      {
         path: 'approve',
         name: '',
         component: () => import('@/views/measure/file/approve.vue'),
@@ -123,6 +135,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'PersonListDetail',
+        component: () => import('@/views/measure/person/components/addPerson.vue'),
+        meta: {
+          title: '计量人员',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'certificateLog',
         name: 'CertificateLog',
         component: () => import('@/views/measure/person/certificateLog.vue'),
@@ -133,6 +157,18 @@
         },
       },
       {
+        path: ':type/:id?',
+        name: 'CertificateLogDetail',
+        component: () => import('@/views/measure/person/components/addRecord.vue'),
+        meta: {
+          title: '证书记录',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/person',
+        },
+      },
+      {
         path: 'remind',
         name: 'Remind',
         component: () => import('@/views/measure/person/remind.vue'),
@@ -228,6 +264,18 @@
           auth: '/measure/measureDept/gcz',
         },
       },
+      {
+        path: ':type/:id?',
+        name: 'MeasureDeptDetail',
+        component: () => import('@/views/measure/measureDept/components/addDialog.vue'),
+        meta: {
+          title: '计量组织',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/measure/measureDept',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 052f3ce..9520aca 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -3,6 +3,7 @@
 import approveAction from './approvalActionDialog.vue'
 import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -121,19 +122,28 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -178,9 +188,15 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -247,8 +263,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -294,7 +309,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index cfda00a..ff89b3a 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import add from '@/views/device/stateManage/components/templateAdd.vue'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 const searchQuery = reactive({
   limit: 10,
   offset: 1,
@@ -113,19 +113,39 @@
 }
 // 详情
 const detail = (row) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: '',
+    },
   })
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: '',
+    },
   })
 }
 // 删除
@@ -173,9 +193,19 @@
 }
 // 新增
 const addBtn = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '',
+    },
   })
 }
 // 导出
@@ -209,8 +239,7 @@
 <template>
   <div>
     <!-- 添加/编辑/查看 -->
-    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 审批操作 -->
       <approve-action ref="approveRef" />
       <!-- 筛选条件 -->
@@ -256,7 +285,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index d9d4514..e59c2a7 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -12,9 +12,9 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { assetsAddApi, assetsDetailApi, assetsUpdateApi } from '@/api/device/standingBook'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const ruleForm = ref({
   assetNo: '', // 资产编号
@@ -278,11 +278,14 @@
     })
   }
 }
-defineExpose({ initDialog })
+// defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -306,9 +309,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -319,9 +320,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 6e88e96..049d8d4 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -5,24 +5,25 @@
 import type { menuType } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import table from './templateTable.vue'
-const props = defineProps({
-  title: {
-    type: String,
-    require: true,
-  },
-  name: {
-    type: String,
-    require: true,
-  },
-  row: {
-    type: Object,
-    defaule: () => ({}),
-  },
-})
-const emits = defineEmits(['resetData'])
-const title = ref(props.title)
-const name = ref(props.name)
-const row = ref(props.row)
+// const props = defineProps({
+//   title: {
+//     type: String,
+//     require: true,
+//   },
+//   name: {
+//     type: String,
+//     require: true,
+//   },
+//   row: {
+//     type: Object,
+//     defaule: () => ({}),
+//   },
+// })
+const $router = useRouter()
+const $route = useRoute()
+const title = ref('')
+const name = ref('')
+const row = ref({})
 const menu = shallowRef<menuType[]>([
   { name: '基本信息', comp: baseInfo },
   { name: '周检记录', comp: table },
@@ -38,7 +39,7 @@
 })
 // 取消
 const resetForm = () => {
-  emits('resetData')
+  $router.go(-1)
 }
 // 提交
 const submitForm = async () => {
@@ -58,17 +59,24 @@
         console.log(JSON.parse(sessionStorage.getItem('deviceBaseInfo'))) // form表单信息数据
         console.log(JSON.parse(sessionStorage.getItem('tableData'))) // table表格信息数据
         // // emits('resetData')
+        $router.go(-1)
       })
     })
   })
 }
-watch(() => props, (newVal) => {
-  title.value = newVal.title
-  name.value = newVal.name
-  row.value = newVal.row
-}, {
-  deep: true,
-  immediate: true,
+// watch(() => $route.query, (newVal) => {
+//   title.value = newVal.title as string
+//   name.value = newVal.name as string
+//   row.value = JSON.parse(newVal.row as string) as object
+// }, {
+//   deep: true,
+//   immediate: true,
+// })
+onMounted(() => {
+  console.log($route.query)
+  title.value = $route.query.title as string
+  name.value = $route.query.name as string
+  row.value = JSON.parse($route.query.row as string) as object
 })
 </script>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f4229a6..d0ceefb 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,6 +18,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
@@ -173,19 +174,38 @@
 const row = ref()
 // 详情
 const detail = (row) => {
-  dialogVisible.value = true
-  title.value = '详情'
-  row.value = row
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   name: props.name,
-  // })
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '详情'
+  // row.value = row
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row) => {
-  dialogVisible.value = true
-  title.value = '编辑'
-  row.value = row
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+      row: JSON.stringify(row),
+    },
+  })
+  // dialogVisible.value = true
+  // title.value = '编辑'
+  // row.value = row
   // addRef.value.initDialog({
   //   title: '编辑',
   //   name: props.name,
@@ -231,9 +251,17 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  title.value = '新建'
-  row.value = {}
+  $router.push({
+    name: 'standingBookDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+      row: JSON.stringify({}),
+    },
+  })
 }
 // 标签识别
 const identify = () => {
@@ -294,9 +322,8 @@
 
 <template>
   <div>
-    <add-dialog v-if="dialogVisible" ref="addRef" :title="title" :name="props.name" :row="row" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -396,7 +423,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 4c31a94..05e419a 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -7,6 +7,8 @@
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
 import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const $route = useRoute()
 const searchQuery = reactive({
   assetNo: '', // 固定编号
   equipmentName: '', // 设备名称
@@ -129,19 +131,39 @@
 }
 // 详情
 const detail = (row: fixedAssetsType) => {
-  console.log(row, 'row')
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    ...row,
+  // console.log(row, 'row')
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '详情',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      ...row,
+    },
   })
 }
 // 编辑
 const update = (row: fixedAssetsType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '编辑',
-    ...row,
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '编辑',
+  //   ...row,
+  // })
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      ...row,
+    },
   })
 }
 // 删除
@@ -190,10 +212,19 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  $router.push({
+    name: 'fixedAssetsDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -253,9 +284,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -305,7 +335,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="180" fixed="right">
+            <el-table-column label="操作" align="center" width="140" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2003e31..6ae1a30 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,9 +12,9 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-const emits = defineEmits(['resetData'])
+const $router = useRouter()
+const $route = useRoute()
 const ruleFormRef = ref() // from组件
-const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
 const borrowList = ref([])
@@ -275,11 +275,13 @@
   //   })
   // }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   resetDATA()
-  dialogVisible.value = false
+  $router.go(-1)
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -303,9 +305,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('操作成功')
-            dialogVisible.value = false
             close()
-            emits('resetData')
           }
         })
         // dialogVisible.value = false
@@ -316,9 +316,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   close()
-  emits('resetData')
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 737568d..7cc9075 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -13,6 +13,8 @@
     default: '',
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 // import { exportFile } from '@/utils/exportUtils'
 // const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
@@ -143,19 +145,34 @@
 }
 // 详情
 const detail = (row: any) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '详情',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      title: '详情',
+      name: props.name,
+    },
   })
 }
 // 编辑
 const update = (row: any) => {
-  dialogVisible.value = true
+  // dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
   //   ...row,
   // })
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '编辑',
+      name: props.name,
+    },
+  })
 }
 // 删除
 const remove = (row: any) => {
@@ -232,10 +249,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.name,
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: props.name,
+    },
   })
 }
 // 导出
@@ -294,10 +316,8 @@
   <div>
     <!-- 审批操作组件 -->
     <approve ref="approveRef" @reset-data="refreshDta" />
-    <!-- 新建，编辑，详情组件 -->
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -358,7 +378,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="300" fixed="right">
+            <el-table-column label="操作" align="center" width="230" fixed="right">
               <template #default="{ row }">
                 <!-- <el-button size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 1ad577b..c758059 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,10 +9,11 @@
 import useUserStore from '@/store/modules/user'
 import { toTreeList } from '@/utils/structure'
 import { getDeptTreeList } from '@/api/system/dept'
-import { UploadFile, addApi } from '@/api/measure/file'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
 const fileTypeName = ref('')
@@ -45,7 +46,6 @@
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -69,9 +69,7 @@
   ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
-  dialogVisible.value = true
   title.value = row.title
-  // effectiveStatusName.value = ''
   fileList.value = []
   getuser()
   getuser()
@@ -81,27 +79,6 @@
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    // 判断有无存储
-    if (sessionStorage.getItem(fileTypeName.value)) {
-      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
-      ruleForm.fileType = session.fileType
-      ruleForm.fileName = session.fileName
-      ruleForm.fileCode = session.fileCode
-      ruleForm.minioFileName = session.minioFileName
-      ruleForm.publishTime = session.publishTime
-      ruleForm.remark = session.remark
-      ruleForm.publishTime = session.publishTime
-      ruleForm.effectiveTime = session.effectiveTime
-      ruleForm.effectiveStatus = session.effectiveStatus
-      ruleForm.publishTime = session.publishTime
-      ruleForm.createUserId = session.createUserId
-      if (ruleForm.minioFileName) {
-        fileList.value.push({
-          name: ruleForm.minioFileName,
-          url: '',
-        })
-      }
-    }
   }
   else if (row.title === '详情') {
     ruleForm.createUserId = row.createUserId
@@ -115,11 +92,11 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
-    // ruleForm.publisher = '0'
-    // ruleForm.createUserId = '1'
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 // 关闭弹窗
 const close = () => {
   ruleForm.fileType = ''
@@ -133,6 +110,7 @@
   ruleForm.effectiveStatus = ''
   ruleForm.publishTime = ''
   ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -149,30 +127,29 @@
     },
       ).then((res) => {
         if (ruleForm.publisher === userInfo.$state.deptName) {
-          ruleForm.publisher === userInfo.$state.deptId
+          ruleForm.publisher = userInfo.$state.deptId
         }
         if (flag == '提交') {
-          addApi(ruleForm).then((res) => {
+          confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
-              formEl?.resetFields()
-              ElMessage.success('提交成功')
-              emits('resetData')
-              if (sessionStorage.getItem(fileTypeName.value)) {
-                sessionStorage.removeItem(fileTypeName.value)
-              }
-              close()
-              dialogVisible.value = false
+              console.log(res.data, '保存成功')
+              submitFile({ id: res.data.id }).then((res) => {
+                formEl?.resetFields()
+                ElMessage.success('提交成功')
+                $router.go(-1)
+                close()
+              })
             }
           })
         }
         else {
-          // 保存
-          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
-          ElMessage.success('保存成功')
-          formEl?.resetFields()
-          emits('resetData')
-          close()
-          dialogVisible.value = false
+          // 保存（草稿箱）
+          confirmDrafts(ruleForm).then((res) => {
+            ElMessage.success('保存成功')
+            formEl?.resetFields()
+            $router.go(-1)
+            close()
+          })
         }
       })
     }
@@ -182,8 +159,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
-  dialogVisible.value = false
-  emits('resetData')
+  $router.go(-1)
 }
 
 const fileRef = ref() // 文件上传input
@@ -217,27 +193,29 @@
 //   { name: '已废止', id: '1595030083114450945', value: '3' },
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
-  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  if (diffDat < 0) {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else if (diffDat == 0) {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
     // ruleForm.effectiveStatusName = '在使用'
-    effectiveStatusName.value = '在使用'
-    ruleForm.effectiveStatus = '1'
-  }
-  else {
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
     // ruleForm.effectiveStatusName = '未使用'
-    effectiveStatusName.value = '未使用'
-    ruleForm.effectiveStatus = '2'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
   }
 })
 </script>
 
 <template>
-  <app-container v-if="dialogVisible" style="overflow: hidden;">
+  <app-container style="overflow: hidden;">
     <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
diff --git a/src/views/measure/file/components/addDialogCancel.vue b/src/views/measure/file/components/addDialogCancel.vue
new file mode 100644
index 0000000..84b985c
--- /dev/null
+++ b/src/views/measure/file/components/addDialogCancel.vue
@@ -0,0 +1,378 @@
+<!-- 新增或详情弹窗  保存功能-本地sessionStorage版   废弃 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptName
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    // 判断有无存储
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
+  }
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        console.log(ruleForm.publisher, userInfo.$state.deptName)
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher = userInfo.$state.deptId
+        }
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              ElMessage.success('提交成功')
+              emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
+            }
+          })
+        }
+        else {
+          // 保存
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
+          ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  dialogVisible.value = false
+  emits('resetData')
+}
+
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
+    <detail-page :title="`${fileTypeName}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          提交
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
+                :tree-props="deptProps"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 542b284..d6b3b02 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -25,7 +25,7 @@
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: props.value, // 审批状态
+  approvalStatus: '', // 审批状态
   limit: 20,
   offset: 1,
   fileType: '', // 类型
@@ -64,19 +64,13 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-// 获取类型
 const fileTypeList = ref([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-}
-const approvalStatus = ref([])
 // 获取审批状态
 const getStatus = () => {
   getDictByCode('approvalStatus').then((res) => {
     if (res.code === 200) {
-      approvalStatus.value = res.data
+      fileTypeList.value = res.data
+      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
     }
   })
 }
@@ -283,7 +277,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
             <el-option
               v-for="item in fileTypeList"
@@ -292,7 +286,7 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index e54ddf5..9b84368 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -1,7 +1,6 @@
 <!-- 计量文件公共模板 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './addDialog.vue'
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,7 @@
     required: true,
   },
 })
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
@@ -61,8 +61,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const fileTypeList = ref<fileResType[]>([])
 const getType = async () => {
@@ -110,12 +108,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    title: '详情',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      fileType: searchQuery.fileType,
+      title: '详情',
+      fileTypeName: props.name,
+    },
   })
 }
 // 下载(单个)
@@ -188,11 +191,16 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新建',
-    fileTypeName: props.name,
+  $router.push({
+    name: 'measureFileDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      fileType: searchQuery.fileType,
+      title: '新建',
+      fileTypeName: props.name,
+    },
   })
 }
 // 导出
@@ -238,10 +246,9 @@
   fileRef.value.click()
 }
 // 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
+// const refreshDta = () => {
+//   getList()
+// }
 onMounted(() => {
   getStatus()
   getType().then((_) => {
@@ -252,9 +259,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -327,7 +333,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="200">
+            <el-table-column label="操作" align="center" width="170">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index a95c665..9f15066 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -8,8 +8,8 @@
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-const emits = defineEmits(['resetData'])
-const router = useRoute()
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -24,6 +24,7 @@
   pDeptName: '',
 }) // 表单
 const title = ref('')
+const path = ref('')
 const rules = ref<FormRules>({
   organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
@@ -36,7 +37,7 @@
   getStaffList({
     staffNo: '', // 人员编号
     name: '', // 姓名
-    deptId: ruleForm.value.deptId, // 所在部门
+    deptId: '', // 所在部门
     limit: 999999,
     offset: 1,
   }).then((res) => {
@@ -87,7 +88,7 @@
           if (res.code == 200) {
             formEl?.resetFields()
             ElMessage.success('提交成功')
-            emits('resetData')
+            $router.go(-1)
           }
         })
       })
@@ -97,7 +98,7 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  emits('resetData')
+  $router.go(-1)
 }
 // 重置
 const reset = () => {
@@ -352,8 +353,7 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  console.log(router.path.split('/')[2], '路由')
-  if (router.path.split('/')[2] === 'bm') {
+  if (path.value === 'bm') {
     // 获取科室
     listPageApi({
       organizeNo: '',
@@ -370,7 +370,7 @@
       changeList_bm.value[0].data = res.data.rows
     })
   }
-  else if (router.path.split('/')[2] === 'ks') {
+  else if (path.value === 'ks') {
     // 获取工程组
     listPageApi({
       organizeNo: '',
@@ -426,6 +426,7 @@
 const initDialog = (row: any) => {
   reset()
   title.value = row.title
+  path.value = row.path
   ruleForm.value.organizeType = row.organizeType
   ruleForm.value.deptId = row.deptId
   getuser()
@@ -453,7 +454,9 @@
     current.value = changeList_gcz.value[0].name
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 11d6d0a..50918a0 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -2,7 +2,6 @@
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
-import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
@@ -18,6 +17,8 @@
     required: true,
   },
 })
+const $router = useRouter()
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
@@ -91,8 +92,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -143,19 +142,32 @@
 }
 // 详情
 const detail = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-详情`,
+  $router.push({
+    path: '/measureDept/detail',
+    query: {
+      ...row,
+      title: `${props.name}-详情`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog()
 }
 // 编辑
 const update = (row: rowType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: `${props.name}-编辑`,
+  $router.push({
+    path: '/measureDept/edit',
+    query: {
+      ...row,
+      title: `${props.name}-编辑`,
+      path: $route.path.split('/')[2],
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: `${props.name}-编辑`,
+  // })
 }
 // 搜索
 const search = () => {
@@ -189,7 +201,6 @@
 // 传给子组件的刷新事件
 const refreshDta = () => {
   getList()
-  dialogVisible.value = false
 }
 onMounted(() => {
   getDepartmentList()
@@ -201,9 +212,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -260,7 +270,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center" width="110">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bc5d9d4..11eeb7b 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,7 +1,6 @@
 <!-- 证书记录 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addRecord.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -20,6 +19,8 @@
     default: 'certificateLog',
   },
 })
+const $route = useRoute()
+const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -78,8 +79,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 const deptProps = reactive({
   parent: 'pid', value: 'id', label: 'name', children: 'children',
 })
@@ -116,21 +115,43 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      ...row,
+      title: '详情',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      ...row,
+      title: '编辑',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 
 // 删除
@@ -199,11 +220,21 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
-    name: props.isRemind ? '证书状况' : '证书记录',
+  $router.push({
+    name: 'CertificateLogDetail',
+    params: {
+      type: 'edit',
+    },
+    query: {
+      title: '新建',
+      name: props.isRemind ? '证书状况' : '证书记录',
+    },
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  //   name: props.isRemind ? '证书状况' : '证书记录',
+  // })
 }
 // 导出
 const exportExcelBtn = () => {
@@ -259,9 +290,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -325,7 +355,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="180">
+            <el-table-column fixed="right" label="操作" align="center" :width="props.isRemind ? '140' : '110'">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 5a5f036..1e4373c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -17,6 +17,8 @@
 import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
+const $route = useRoute()
+const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   account: '',
@@ -321,8 +323,8 @@
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
-              emits('resetData')
               resetFormData()
+              $router.go(-1)
             }
           })
         }
@@ -337,7 +339,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   changeList.value[0].data = []
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -376,6 +378,9 @@
     }
   })
 })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 660f2b0..e2403ed 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -12,9 +12,10 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
-const emits = defineEmits(['resetData'])
 const ruleFormRef1 = ref<FormInstance>() // from组件
 const ruleFormRef2 = ref<FormInstance>() // from组件
+const $route = useRoute()
+const $router = useRouter()
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -185,7 +186,7 @@
         formEl1?.resetFields()
         formEl2?.resetFields()
         ElMessage.success('提交成功')
-        emits('resetData')
+        $router.go(-1)
         resetFormData()
       })
     })
@@ -195,7 +196,7 @@
 const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
   formEl2?.resetFields()
-  emits('resetData')
+  $router.go(-1)
   resetFormData()
 }
 const selectTreeRef = ref()
@@ -225,7 +226,9 @@
     })
   }
 }
-defineExpose({ initDialog })
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 355473a..e119e0d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -1,7 +1,6 @@
 <!-- 计量人员列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
 import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
 // import { uploadApi } from '@/api/system/notice'
@@ -11,6 +10,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
+const $router = useRouter()
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -51,8 +52,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -86,19 +85,33 @@
 }
 // 详情
 const detail = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '详情',
+  $router.push({
+    query: {
+      ...row,
+      title: '详情',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '详情',
+  // })
 }
 // 编辑
 const update = (row: StaffType) => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    ...row,
-    title: '编辑',
+  $router.push({
+    query: {
+      ...row,
+      title: '编辑',
+    },
+    path: '/person/detail',
   })
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   ...row,
+  //   title: '编辑',
+  // })
 }
 
 // 删除
@@ -145,9 +158,15 @@
 }
 // 新增
 const add = () => {
-  dialogVisible.value = true
-  addRef.value.initDialog({
-    title: '新建',
+  // dialogVisible.value = true
+  // addRef.value.initDialog({
+  //   title: '新建',
+  // })
+  $router.push({
+    query: {
+      title: '新建',
+    },
+    path: '/person/detail',
   })
 }
 // 导出
@@ -207,9 +226,8 @@
 
 <template>
   <div>
-    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
@@ -266,7 +284,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="170">
+            <el-table-column fixed="right" label="操作" align="center" width="130">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index a4cdd5e..21d9af6 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -195,7 +195,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="100">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index d3c6f81..7cd607b 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index a2468de..cb77376 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -213,7 +213,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="170">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index ac857ea..4a49f38 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -212,7 +212,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="170">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index f44f661..7e5f9f7 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -210,7 +210,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="250">
+          <el-table-column label="操作" align="center" width="130">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/tool/signature/update')" size="small" type="primary" link @click="edit(row)">
                 编辑