diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index b71e080..f7b262f 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -1,10 +1,88 @@
 <!-- 签名管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签名
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index b71e080..f7b262f 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -1,10 +1,88 @@
 <!-- 签名管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签名
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 30cd9d5..c364465 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -1,12 +1,88 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 证书报告模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index b71e080..f7b262f 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -1,10 +1,88 @@
 <!-- 签名管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签名
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 30cd9d5..c364465 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -1,12 +1,88 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 证书报告模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 12ae700..bd5cb95 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -1,10 +1,88 @@
-<!-- 文档模板管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    文档模板管理
-  </div>
-</template>
-<style lang="scss" scoped>
+<!-- 原始记录模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index b71e080..f7b262f 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -1,10 +1,88 @@
 <!-- 签名管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签名
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 30cd9d5..c364465 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -1,12 +1,88 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 证书报告模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 12ae700..bd5cb95 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -1,10 +1,88 @@
-<!-- 文档模板管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    文档模板管理
-  </div>
-</template>
-<style lang="scss" scoped>
+<!-- 原始记录模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4ca1c56..0045732 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -1,10 +1,96 @@
 <!-- 签章管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签章管理
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>

diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
new file mode 100644
index 0000000..dec43d1
--- /dev/null
+++ b/src/api/system/notice.ts
@@ -0,0 +1,22 @@
+/*
+ * 通知公告接口
+*/
+import request from '../index'
+const prefix = 'system'
+
+// 获取公告列表/详情
+export function getNoticeeApi(params: object) {
+  return request({
+    url: `${prefix}/notice/listPage`,
+    method: 'get',
+    params,
+  })
+}
+// 通知公告新建
+export function addNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/add`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 76e9abc..f8c750b 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -7,7 +7,7 @@
     path: '/bench',
     component: Layout,
     redirect: '/bench/list',
-    name: 'AreaManage',
+    name: 'Bench',
     meta: {
       title: '工作台',
       icon: 'ep:key',
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'BenchList',
-        component: () => import('@/views/system/area/bench.vue'),
+        component: () => import('@/views/measure/bench/bench.vue'),
         meta: {
           title: '工作台',
           auth: '/measure/bench',
@@ -101,14 +101,14 @@
     ],
   },
   {
-    path: '/measure/person',
+    path: '/person',
     component: Layout,
     redirect: '/measure/person/list',
     name: 'Person',
     meta: {
       title: '计量人员',
       icon: 'ep:key',
-      auth: '/person',
+      auth: '/measure/person',
     },
     children: [
       {
@@ -165,23 +165,122 @@
         },
       },
       {
-        path: 'certificateLog',
-        name: 'CertificateLog',
-        component: () => import('@/views/measure/person/certificateLog.vue'),
+        path: 'trainPlanApprove',
+        name: 'TrainPlanApprove',
+        component: () => import('@/views/measure/train/trainPlanApprove.vue'),
         meta: {
-          title: '证书记录',
+          title: '培训计划审批',
           icon: 'ep:key',
-          auth: '/measure/person/certificateLog',
+          auth: '/measure/train/trainPlanApprove',
         },
       },
       {
-        path: 'remind',
-        name: 'Remind',
-        component: () => import('@/views/measure/person/remind.vue'),
+        path: 'trainLog',
+        name: 'TrainLog',
+        component: () => import('@/views/measure/train/trainLog.vue'),
         meta: {
-          title: '证书到期提醒',
+          title: '培训记录',
           icon: 'ep:key',
-          auth: '/measure/person/remind',
+          auth: '/measure/train/trainLog',
+        },
+      },
+    ],
+  },
+  {
+    path: '/measureDept',
+    component: Layout,
+    redirect: '/measure/measureDept/bm',
+    name: 'MeasureDept',
+    meta: {
+      title: '计量组织',
+      icon: 'ep:key',
+      auth: '/measure/measureDept',
+    },
+    children: [
+      {
+        path: 'bm',
+        name: 'Bm',
+        component: () => import('@/views/measure/measureDept/bm.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/bm',
+        },
+      },
+      {
+        path: 'ks',
+        name: 'Ks',
+        component: () => import('@/views/measure/measureDept/ks.vue'),
+        meta: {
+          title: '科室管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/ks',
+        },
+      },
+      {
+        path: 'gcz',
+        name: 'Gcz',
+        component: () => import('@/views/measure/measureDept/gcz.vue'),
+        meta: {
+          title: '工程组管理',
+          icon: 'ep:key',
+          auth: '/measure/measureDept/gcz',
+        },
+      },
+    ],
+  },
+  {
+    path: '/source',
+    component: Layout,
+    redirect: '/measure/measureSource/list',
+    name: 'MeasureSource',
+    meta: {
+      title: '溯源供方',
+      icon: 'ep:key',
+      auth: '/measure/measureSource',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measureSourceList',
+        component: () => import('@/views/measure/source/list.vue'),
+        meta: {
+          title: '溯源供方列表',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/list',
+        },
+      },
+      {
+        path: 'approve',
+        name: 'SourceApprove',
+        component: () => import('@/views/measure/source/approve.vue'),
+        meta: {
+          title: '溯源供方审批',
+          icon: 'ep:key',
+          auth: '/measure/measureSource/approve',
+        },
+      },
+    ],
+  },
+  {
+    path: '/price',
+    component: Layout,
+    redirect: '/measure/measurePrice/list',
+    name: 'MeasurePrice',
+    meta: {
+      title: '价格库',
+      icon: 'ep:key',
+      auth: '/measure/measurePrice',
+    },
+    children: [
+      {
+        path: 'list',
+        name: 'measurePriceList',
+        component: () => import('@/views/measure/price/list.vue'),
+        meta: {
+          title: '价格表',
+          icon: 'ep:key',
+          auth: '/measure/measurePrice/list',
         },
       },
     ],
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index feec73f..94d28ef 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -251,7 +251,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/loginLog/list',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -260,7 +260,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/loginLog/list',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
new file mode 100644
index 0000000..791de95
--- /dev/null
+++ b/src/views/measure/measureDept/bm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>部门管理</div>
+</template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
new file mode 100644
index 0000000..8fa4904
--- /dev/null
+++ b/src/views/measure/measureDept/gcz.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>工程组管理</div>
+</template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
new file mode 100644
index 0000000..8c05053
--- /dev/null
+++ b/src/views/measure/measureDept/ks.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>科室管理</div>
+</template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
new file mode 100644
index 0000000..092edc3
--- /dev/null
+++ b/src/views/measure/price/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>价格表</div>
+</template>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
new file mode 100644
index 0000000..2fcdf5d
--- /dev/null
+++ b/src/views/measure/source/approve.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方审批</div>
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
new file mode 100644
index 0000000..e966fb8
--- /dev/null
+++ b/src/views/measure/source/list.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>溯源供方列表</div>
+</template>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c3bf846..0789e96 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>培训计划</div>
+  <div>培训计划111</div>
 </template>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
new file mode 100644
index 0000000..f87a4a5
--- /dev/null
+++ b/src/views/measure/train/trainLog.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训记录</div>
+</template>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
new file mode 100644
index 0000000..3c8f0f4
--- /dev/null
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>培训计划审批</div>
+</template>
diff --git a/src/views/system/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 30cd9d5..61dd8e9 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -1,12 +1,153 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 通知公告 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from './table.header.vue'
+import addNotice from './noteAdd.vue'
+import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+const searchQuery = reactive({
+  noticeNo: '', // 编号
+  noticePublisher: '', // 发布人
+  noticeTime: '', // 发布时间
+  noticeTitle: '', // 标题
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '编号',
+    value: 'noticeNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'noticeTitle',
+    align: 'center',
+  },
+  {
+    text: '发布人',
+    value: 'noticePublisher',
+    align: 'center',
+  },
+  {
+    text: '内容描述',
+    value: 'noticeSketch',
+    align: 'center',
+  },
+  {
+    text: '发布时间',
+    value: 'noticeTime',
+    align: 'center',
+  },
+]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+// 获取通知公告列表
+const getNoticeList = () => {
+  getNoticeeApi(searchQuery).then((res) => {
+    total.value = res.data.total
+    list.value = res.data.rows
+  })
+}
+// 重置查询条件
+const resetSearchQuery = () => {
+  searchQuery.noticeNo = ''
+  searchQuery.noticePublisher = ''
+  searchQuery.noticeTime = ''
+  searchQuery.noticeTitle = ''
+}
+// 查询
+const search = () => {
+  getNoticeList()
+}
+// 重置
+const reset = () => {
+  resetSearchQuery()
+  search()
+}
+const addDialog = ref() // 添加弹窗组件
+// 新建
+const add = () => {
+  addDialog.value.initDialog()
+}
+onMounted(() => {
+  getNoticeList()
+})
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeNo" placeholder="请输入编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary" @click="add">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <addNotice @reset-data="getNoticeList" ref="addDialog" />
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
new file mode 100644
index 0000000..d37a9bb
--- /dev/null
+++ b/src/views/system/notice/noteAdd.vue
@@ -0,0 +1,67 @@
+<!-- 新增通知公告弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+}) // 表单
+const rules = ref<FormRules>({
+  noticeNo: [{ required: true, message: '通知公告编号不能为空', trigger: 'blur' }],
+  noticeSketch: [{ required: true, message: '内容简述不能为空', trigger: 'blur' }],
+  noticeContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+// 弹窗初始化
+const initDialog = () => {
+  dialogVisible.value = true
+}
+defineExpose({ initDialog })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-form-item label="通知公告编号" prop="noticeNo">
+        <el-input v-model.trim="ruleForm.noticeNo" placeholder="请输入通知公告编号" />
+      </el-form-item>
+      <el-form-item label="发布人" prop="noticePublisher">
+        <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+      </el-form-item>
+      <el-form-item label="发布单位" prop="noticeCompany">
+        <el-input v-model.trim="ruleForm.noticeCompany" />
+      </el-form-item>
+      <el-form-item label="发布时间" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTime" />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" />
+      </el-form-item>
+      <el-form-item label="附件" prop="noticeTime">
+        <el-button type="primary">上传</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">发布</el-button>
+        <el-button>关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/table.header.vue b/src/views/system/notice/table.header.vue
new file mode 100644
index 0000000..e65bccd
--- /dev/null
+++ b/src/views/system/notice/table.header.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+// props参数
+const props = defineProps({
+  title: {
+    type: String,
+    default: '数据列表',
+  },
+})
+</script>
+
+<template>
+  <div class="table-header">
+    <div class="title">
+      {{ title }}
+    </div>
+    <div class="btns">
+      <slot name="btns" />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table-header {
+  height: 45px;
+  display: flex;
+  padding: 0 15px;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-left: none;
+  border-right: none;
+
+  .title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index b71e080..f7b262f 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -1,10 +1,88 @@
 <!-- 签名管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签名
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 30cd9d5..c364465 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -1,12 +1,88 @@
-<!-- 签名管理 -->
-<script lang="ts" setup></script>
+<!-- 证书报告模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
 <template>
-  <div>
-    签名
-  </div>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
 </template>
 
 <style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
 
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 12ae700..bd5cb95 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -1,10 +1,88 @@
-<!-- 文档模板管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    文档模板管理
-  </div>
-</template>
-<style lang="scss" scoped>
+<!-- 原始记录模板 -->
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">新建</el-button>
+        <el-button type="primary">导出</el-button>
+        <el-button type="primary">打印</el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage">
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4ca1c56..0045732 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -1,10 +1,96 @@
 <!-- 签章管理 -->
-<script lang="ts" setup></script>
-<template>
-  <div>
-    签章管理
-  </div>
-</template>
-<style lang="scss" scoped>
+<script lang="ts" setup>
+import { Delete } from '@element-plus/icons-vue'
+import tableHeader from '../../notice/table.header.vue'
+const searchQuery = reactive({
+  code: '', // 编号
+  name: '', // 名称
+  director: '', // 负责人
+  createTime: '', // 创建时间
+  limit: 0,
+  offset: 0,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([]) // 表格
+const list = ref([]) // 表格数据
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+}
+</script>
 
+<template>
+  <!-- 布局 -->
+  <AppContainer>
+    <!-- 筛选条件 -->
+    <search-area>
+      <search-item>
+        <el-input v-model="searchQuery.code" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.name" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <template #btns>
+        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }">
+          重置
+        </el-button>
+      </template>
+    </search-area>
+    <!-- 表头区域 -->
+    <tableHeader title="数据列表">
+      <template #btns>
+        <el-button type="primary">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
+      </template>
+    </tableHeader>
+    <!-- 表格区域 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button>
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </AppContainer>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 180px !important;
+  margin-right: 15px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
 </style>
diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue
index 07eabd3..efbac4a 100644
--- a/src/views/system/user/select.tree.vue
+++ b/src/views/system/user/select.tree.vue
@@ -49,12 +49,17 @@
       currentNodeLabel: '',
     })
     const treeSelect = ref<HTMLElement | null>(null)
+    const blur = ref<HTMLElement | null>()
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
       select.currentNodeKey = data.id
       select.currentNodeLabel = data.label || data.name
-      select.value = data.id;
-      (treeSelect.value as any).blur()
-      emit('update:modelValue', select.value)
+      select.value = data.id
+      emit('update:modelValue', select.value);
+      //  关闭下拉框
+      (treeSelect.value as any).handleClose()
+      nextTick(() => {
+        (treeSelect.value as any).handleClose()
+      })
     }
     // 筛选方法
     const treeV2: any = ref<HTMLElement | null>(null)
@@ -114,12 +119,16 @@
 
 <template>
   <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
-    <el-select ref="treeSelect" v-model="value" clearable filterable :placeholder="placeholder || '请选择'"
-      :filter-method="selectFilter" @clear="clearSelected">
+    <el-select
+      ref="treeSelect" v-model="value" clearable filterable :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected"
+    >
       <el-option :value="currentNodeKey" :label="currentNodeLabel">
-        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+        <el-tree-v2
+          id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
           :current-node-key="currentNodeKey" default-expand-all :expand-on-click-node="false"
-          :filter-method="treeFilter" @node-click="nodeClick" />
+          :filter-method="treeFilter" @node-click="nodeClick"
+        />
       </el-option>
     </el-select>
   </div>